From c1ef065782051db96cdfd32cf55be6408c2a9d22 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:14 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f. --- src/electronics/gpsimprocessor.cpp | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/electronics/gpsimprocessor.cpp') diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index 97f1195..8ad853c 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "gpsim/cod.h" @@ -89,7 +89,7 @@ GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent ) m_bCanExecuteNextCycle = true; m_bIsRunning = false; m_pPicProcessor = 0l; - m_codLoadStatus = CodUnknown; + m_codLoadtqStatus = CodUnknown; m_pRegisterMemory = 0l; m_debugMode = GpsimDebugger::AsmDebugger; m_pDebugger[0] = m_pDebugger[1] = 0l; @@ -101,37 +101,37 @@ GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent ) switch ( (cod_errors)load_symbol_file( &tempProcessor, fileName ) ) { case COD_SUCCESS: - m_codLoadStatus = CodSuccess; + m_codLoadtqStatus = CodSuccess; break; case COD_FILE_NOT_FOUND: - m_codLoadStatus = CodFileNotFound; + m_codLoadtqStatus = CodFileNotFound; break; case COD_UNRECOGNIZED_PROCESSOR: - m_codLoadStatus = CodUnrecognizedProcessor; + m_codLoadtqStatus = CodUnrecognizedProcessor; break; case COD_FILE_NAME_TOO_LONG: - m_codLoadStatus = CodFileNameTooLong; + m_codLoadtqStatus = CodFileNameTooLong; break; case COD_LST_NOT_FOUND: - m_codLoadStatus = CodLstNotFound; + m_codLoadtqStatus = CodLstNotFound; break; case COD_BAD_FILE: - m_codLoadStatus = CodBadFile; + m_codLoadtqStatus = CodBadFile; break; default: - m_codLoadStatus = CodUnknown; + m_codLoadtqStatus = CodUnknown; } #else // GPSIM_0_21_11+ FILE * pFile = fopen( fileName, "r" ); if ( !pFile ) - m_codLoadStatus = CodFileUnreadable; + m_codLoadtqStatus = CodFileUnreadable; else - m_codLoadStatus = ( ProgramFileTypeList::GetList().LoadProgramFile( & tempProcessor, fileName, pFile ) ) ? CodSuccess : CodFailure; + m_codLoadtqStatus = ( ProgramFileTypeList::GetList().LoadProgramFile( & tempProcessor, fileName, pFile ) ) ? CodSuccess : CodFailure; #endif m_pPicProcessor = dynamic_cast(tempProcessor); - if ( codLoadStatus() == CodSuccess ) + if ( codLoadtqStatus() == CodSuccess ) { m_pRegisterMemory = new RegisterSet( m_pPicProcessor ); m_pDebugger[0] = new GpsimDebugger( GpsimDebugger::AsmDebugger, this ); @@ -154,33 +154,33 @@ GpsimProcessor::~GpsimProcessor() } -void GpsimProcessor::displayCodLoadStatus( ) +void GpsimProcessor::displayCodLoadtqStatus( ) { - switch (m_codLoadStatus) + switch (m_codLoadtqStatus) { case CodSuccess: break; case CodFileNotFound: - KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").arg(m_symbolFile), i18n("File Not Found") ); + KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("File Not Found") ); break; case CodUnrecognizedProcessor: - KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").arg(m_symbolFile), i18n("Unrecognized Processor") ); + KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").tqarg(m_symbolFile), i18n("Unrecognized Processor") ); break; case CodFileNameTooLong: - KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").arg(m_symbolFile), i18n("Filename Too Long") ); + KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").tqarg(m_symbolFile), i18n("Filename Too Long") ); break; case CodLstNotFound: - KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").arg(m_symbolFile), i18n("LST File Not Found") ); + KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("LST File Not Found") ); break; case CodBadFile: - KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").arg(m_symbolFile), i18n("Bad File") ); + KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").tqarg(m_symbolFile), i18n("Bad File") ); break; case CodFileUnreadable: - KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").arg(m_symbolFile), i18n("Unreadable File") ); + KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").tqarg(m_symbolFile), i18n("Unreadable File") ); break; case CodFailure: case CodUnknown: - KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").arg(m_symbolFile), i18n("Error") ); + KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").tqarg(m_symbolFile), i18n("Error") ); break; } } -- cgit v1.2.1