Added controlled conversions to char* instead of automatic ascii conversions.

The definition of -UTQT_NO_ASCII_CAST is no longer needed. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago · c0263d89c6
parent f0a3534123
commit c0263d89c6
5 changed files with 10 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -61,7 +61,7 @@ include( ConfigureChecks.cmake )

 ###### global compiler settings

-add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
+add_definitions( -DHAVE_CONFIG_H )

 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
--- a/lib/libchmfile/libchmfileimpl.cpp
+++ b/lib/libchmfile/libchmfileimpl.cpp
@ -864,7 +864,7 @@ TQCString LCHMFileImpl::convertSearchWord( const TQString & src )
 	};

 	if ( !m_textCodec )
-		return (TQCString) src.lower();
+		return src.lower().utf8();

 	TQCString dest = m_textCodec->fromUnicode (src);

@ -996,7 +996,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH
 		else if ( tagword == "/object" && in_object ) 
 		{
 			// a topic entry closed. Add a tree item
-			if ( entry.name )
+			if ( !entry.name.isEmpty() )
 			{
 				if ( !root_indent_offset_set )
 				{
--- a/lib/libchmfile/libchmfileimpl.h
+++ b/lib/libchmfile/libchmfileimpl.h
@ -109,7 +109,7 @@ class LCHMFileImpl
 		//! Encode the string with the currently selected text codec, if possible. Or return as-is, if not.
 		inline TQString encodeWithCurrentCodec (const TQString& str) const
 		{
-			return (m_textCodec ? m_textCodec->toUnicode (str) : str);
+			return (m_textCodec ? m_textCodec->toUnicode (str.utf8()) : str);
 		}

 		//! Encode the string with the currently selected text codec, if possible. Or return as-is, if not.
@ -122,7 +122,7 @@ class LCHMFileImpl
 		//! Or return as-is, if not.	
 		inline TQString encodeInternalWithCurrentCodec (const TQString& str) const
 		{
-			return (m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode (str) : str);
+			return (m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode (str.utf8()) : str);
 		}
 	
 		//! Encode the string from internal files with the currently selected text codec, if possible. 
--- a/lib/libchmfile/libchmurlfactory.h
+++ b/lib/libchmfile/libchmurlfactory.h
@ -113,7 +113,7 @@ static inline bool handleFileType( const TQString& link, TQString& generated )
 	if ( !link.endsWith( intext ) )
 		return false;

-	TQString filelink = link.left( link.length() - strlen( intext ) );
+	TQString filelink = link.left( link.length() - intext.length() );
 	generated = "<html><body><img src=\"" + filelink + "\"></body></html>";
 	return true;
 }
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@ -632,7 +632,7 @@ bool KCHMMainWindow::parseCmdLineArgs( )
 	search_index = args->getOption ("sindex");
 	
 	if ( args->count() > 0 )
-		filename = args->arg(0);
+		filename = TQString::fromLocal8Bit(args->arg(0));
 #else
 	// argv[0] in TQt is still a program name
 	for ( int i = 1; i < tqApp->argc(); i++  )
@ -651,13 +651,13 @@ bool KCHMMainWindow::parseCmdLineArgs( )
 			exit (1);
 		}
 		else
-			filename = tqApp->argv()[i];
+			filename = TQSTring::fromLocal8Bit(tqApp->argv()[i]);
 	}
 #endif

 	if ( !filename.isEmpty() )
 	{
-		if ( !loadChmFile( TQString::fromLocal8Bit( filename )) )
+		if ( !loadChmFile( filename ) )
 			return true; // skip the latest checks, but do not exit from the program

 		if ( !search_index.isEmpty() )