From aca58384d909cd450bae59a6f46679d8cbb3606a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 2 Nov 2020 22:33:43 +0100
Subject: Added controlled conversions to char* instead of automatic ascii
 conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2c73ccdf45212ab2a43582955be0eff21c70f971)
---
 microbe/instruction.cpp | 6 +++---
 microbe/main.cpp        | 4 ++--
 microbe/pic14.cpp       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'microbe')

diff --git a/microbe/instruction.cpp b/microbe/instruction.cpp
index 26332c0..2a77b98 100644
--- a/microbe/instruction.cpp
+++ b/microbe/instruction.cpp
@@ -517,8 +517,8 @@ bool RegisterState::operator == ( const RegisterState & state ) const
 
 void RegisterState::print()
 {
-	cout << "   known="<<binary(known)<<endl;
-	cout << "   value="<<binary(value)<<endl;
+	cout << "   known=" << binary(known).local8Bit() << endl;
+	cout << "   value=" << binary(value).local8Bit() << endl;
 }
 //END class RegisterState
 
@@ -714,7 +714,7 @@ void ProcessorState::print()
 	RegisterMap::iterator end = m_registers.end();
 	for ( RegisterMap::iterator it = m_registers.begin(); it != end; ++it )
 	{
-		cout << " " << it.key().name() << ":\n";
+		cout << " " << it.key().name().local8Bit() << ":\n";
 		it.data().print();
 	}
 }
diff --git a/microbe/main.cpp b/microbe/main.cpp
index 7b6d5ab..affa666 100644
--- a/microbe/main.cpp
+++ b/microbe/main.cpp
@@ -64,14 +64,14 @@ int main(int argc, char **argv)
 		
 		if ( !errorReport.isEmpty() )
 		{
-			cerr << mb.errorReport();
+			cerr << mb.errorReport().local8Bit();
 			return 1; // If there was an error, don't write the output to file.
 		}
 		
 		else
 		{
 			ofstream out(args->arg(1));
-			out << s;
+			out << s.local8Bit();
 			return 0;
 		}
 	}
diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp
index 5c92ef3..1ac4c27 100644
--- a/microbe/pic14.cpp
+++ b/microbe/pic14.cpp
@@ -135,7 +135,7 @@ PIC14::Type PIC14::toType( const TQString & _text )
 	if ( text == "16F628" )
 		return P16F628;
 	
-	cerr << TQString("%1 is not a known PIC identifier\n").arg(_text);
+	cerr << TQString("%1 is not a known PIC identifier\n").arg(_text).local8Bit();
 	return unknown;
 }
 
-- 
cgit v1.2.1