From 87a016680e3677da3993f333561e79eb0cead7d5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 29 Jun 2011 16:05:55 +0000 Subject: TQt4 port ktechlab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1238801 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/flowcodedocument.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/flowcodedocument.cpp') diff --git a/src/flowcodedocument.cpp b/src/flowcodedocument.cpp index ad2c346..e8d7512 100644 --- a/src/flowcodedocument.cpp +++ b/src/flowcodedocument.cpp @@ -27,7 +27,7 @@ #include #include -FlowCodeDocument::FlowCodeDocument( const QString &caption, KTechlab *ktechlab, const char *name ) +FlowCodeDocument::FlowCodeDocument( const TQString &caption, KTechlab *ktechlab, const char *name ) : ICNDocument( caption, ktechlab, name ) { m_pDocumentIface = new FlowCodeDocumentIface(this); @@ -71,7 +71,7 @@ View *FlowCodeDocument::createView( ViewContainer *viewContainer, uint viewAreaI } -void FlowCodeDocument::setPicType( const QString &id ) +void FlowCodeDocument::setPicType( const TQString &id ) { if ( m_microSettings && m_microSettings->microInfo() && m_microSettings->microInfo()->id() == id ) return; @@ -93,7 +93,7 @@ void FlowCodeDocument::setPicType( const QString &id ) } m_microSettings = new MicroSettings(m_microInfo); - connect( m_microSettings, SIGNAL(pinMappingsChanged()), this, SIGNAL(pinMappingsChanged()) ); + connect( m_microSettings, TQT_SIGNAL(pinMappingsChanged()), this, TQT_SIGNAL(pinMappingsChanged()) ); //TODO restore pic settings from temporary location if appropriate delete m_picItem; @@ -104,7 +104,7 @@ void FlowCodeDocument::setPicType( const QString &id ) } -bool FlowCodeDocument::isValidItem( const QString &itemId ) +bool FlowCodeDocument::isValidItem( const TQString &itemId ) { return itemId.startsWith("flow/") || itemId.startsWith("dp/"); } @@ -191,7 +191,7 @@ void FlowCodeDocument::convertToMicrobe() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Microbe ); LanguageManager::self()->compile(o); @@ -213,7 +213,7 @@ void FlowCodeDocument::convertToAssembly() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_AssemblyAbsolute ); LanguageManager::self()->compile(o); @@ -224,7 +224,7 @@ void FlowCodeDocument::convertToAssembly() void FlowCodeDocument::convertToHex() { - OutputMethodDlg *dlg = new OutputMethodDlg( i18n("Hex Code Output"), url(), false, (QWidget*)p_ktechlab ); + OutputMethodDlg *dlg = new OutputMethodDlg( i18n("Hex Code Output"), url(), false, (TQWidget*)p_ktechlab ); dlg->setOutputExtension(".hex"); dlg->setFilter("*.hex|Hex (*.hex)\n*|All Files"); dlg->exec(); @@ -235,7 +235,7 @@ void FlowCodeDocument::convertToHex() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Program ); LanguageManager::self()->compile(o); @@ -246,7 +246,7 @@ void FlowCodeDocument::convertToHex() void FlowCodeDocument::convertToPIC() { - ProgrammerDlg * dlg = new ProgrammerDlg( microSettings()->microInfo()->id(), (QWidget*)p_ktechlab, "Programmer Dlg" ); + ProgrammerDlg * dlg = new ProgrammerDlg( microSettings()->microInfo()->id(), (TQWidget*)p_ktechlab, "Programmer Dlg" ); dlg->exec(); if ( !dlg->isAccepted() ) { @@ -264,14 +264,14 @@ void FlowCodeDocument::convertToPIC() } -void FlowCodeDocument::varNameChanged( const QString &newValue, const QString &oldValue ) +void FlowCodeDocument::varNameChanged( const TQString &newValue, const TQString &oldValue ) { if (m_bDeleted) return; // Decrease the old variable count // If none are left after, remove it from microsettings - StringIntMap::iterator it = m_varNames.find(oldValue); + StringIntMap::iterator it = m_varNames.tqfind(oldValue); if ( it != m_varNames.end() ) { --(it.data()); @@ -286,12 +286,12 @@ void FlowCodeDocument::varNameChanged( const QString &newValue, const QString &o // Add the new variable to a count, tell microsettings about it if it is new if ( !newValue.isEmpty() ) { - it = m_varNames.find(newValue); + it = m_varNames.tqfind(newValue); if ( it != m_varNames.end() ) { ++it.data(); } else { m_varNames[newValue] = 1; - microSettings()->setVariable( newValue, QVariant(), false ); + microSettings()->setVariable( newValue, TQVariant(), false ); } } -- cgit v1.2.1