summaryrefslogtreecommitdiffstats
path: root/src/piklab-prog
diff options
context:
space:
mode:
Diffstat (limited to 'src/piklab-prog')
-rw-r--r--src/piklab-prog/cli_interactive.cpp4
-rw-r--r--src/piklab-prog/cmdline.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/piklab-prog/cli_interactive.cpp b/src/piklab-prog/cli_interactive.cpp
index 872a53e..c015d04 100644
--- a/src/piklab-prog/cli_interactive.cpp
+++ b/src/piklab-prog/cli_interactive.cpp
@@ -158,7 +158,7 @@ CLI::ExitCode CLI::Interactive::processLine(const TQString &s)
if ( !ok ) return errorExit(i18n("Number format not recognized."), ARG_ERROR);
PURL::Url dummy;
Breakpoint::Data data(dummy, address);
- if ( Breakpoint::list().tqcontains(data) ) return okExit(i18n("Breakpoint already set at %1.").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
+ if ( Breakpoint::list().contains(data) ) return okExit(i18n("Breakpoint already set at %1.").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
Breakpoint::list().append(data);
Breakpoint::list().setAddress(data, address);
Breakpoint::list().setState(data, Breakpoint::Active);
@@ -279,7 +279,7 @@ Address CLI::Interactive::findRegisterAddress(const TQString &name)
for (uint i=0; i<uint(sfrs.count()); i++) if ( name.lower()==sfrs[i].label().lower() ) return sfrs[i].data().address();
if ( coff==0 ) return Address();
TQMap<TQString, Address> variables = coff->variables();
- if ( variables.tqcontains(name) ) return variables[name];
+ if ( variables.contains(name) ) return variables[name];
return Address();
}
diff --git a/src/piklab-prog/cmdline.cpp b/src/piklab-prog/cmdline.cpp
index ec2cd38..beb309a 100644
--- a/src/piklab-prog/cmdline.cpp
+++ b/src/piklab-prog/cmdline.cpp
@@ -332,7 +332,7 @@ CLI::ExitCode CLI::Main::checkProgrammer()
if ( !_hardware.isEmpty() ) {
::Hardware::Config *config = _progGroup->hardwareConfig();
Port::Description pd = static_cast<Programmer::CliManager *>(Programmer::manager)->portDescription();
- bool ok = (config==0 || config->hardwareNames(pd.type).tqcontains(_hardware));
+ bool ok = (config==0 || config->hardwareNames(pd.type).contains(_hardware));
delete config;
if ( !ok ) return errorExit(i18n("The selected programmer does not supported the specified hardware configuration (\"%1\").").tqarg(_hardware), NOT_SUPPORTED_ERROR);
}