summaryrefslogtreecommitdiffstats
path: root/src/micro/asminfo.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-29 16:05:55 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-29 16:05:55 +0000
commit87a016680e3677da3993f333561e79eb0cead7d5 (patch)
treecbda2b4df8b8ee0d8d1617e6c75bec1e3ee0ccba /src/micro/asminfo.cpp
parent6ce3d1ad09c1096b5ed3db334e02859e45d5c32b (diff)
downloadktechlab-87a016680e3677da3993f333561e79eb0cead7d5.tar.gz
ktechlab-87a016680e3677da3993f333561e79eb0cead7d5.zip
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
Diffstat (limited to 'src/micro/asminfo.cpp')
-rw-r--r--src/micro/asminfo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/micro/asminfo.cpp b/src/micro/asminfo.cpp
index 3a12b57..6006c63 100644
--- a/src/micro/asminfo.cpp
+++ b/src/micro/asminfo.cpp
@@ -22,7 +22,7 @@ AsmInfo::~AsmInfo()
}
-void AsmInfo::addInstruction( const QString & operand, const QString & description, const QString & opcode )
+void AsmInfo::addInstruction( const TQString & operand, const TQString & description, const TQString & opcode )
{
Instruction instruction;
instruction.operand = operand;
@@ -33,7 +33,7 @@ void AsmInfo::addInstruction( const QString & operand, const QString & descripti
}
-QString AsmInfo::setToString( Set set )
+TQString AsmInfo::setToString( Set set )
{
switch (set)
{
@@ -48,11 +48,11 @@ QString AsmInfo::setToString( Set set )
}
kdWarning() << k_funcinfo << "Unrecognized set="<<set<<endl;
- return QString::null;
+ return TQString();
}
-AsmInfo::Set AsmInfo::stringToSet( const QString & set )
+AsmInfo::Set AsmInfo::stringToSet( const TQString & set )
{
if ( set == "PIC12" )
return PIC12;