diff options
Diffstat (limited to 'src/progs/manager')
-rw-r--r-- | src/progs/manager/breakpoint.cpp | 18 | ||||
-rw-r--r-- | src/progs/manager/breakpoint.h | 10 | ||||
-rw-r--r-- | src/progs/manager/debug_manager.cpp | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/progs/manager/breakpoint.cpp b/src/progs/manager/breakpoint.cpp index dc7d836..3cda051 100644 --- a/src/progs/manager/breakpoint.cpp +++ b/src/progs/manager/breakpoint.cpp @@ -23,7 +23,7 @@ Breakpoint::List &Breakpoint::list() void Breakpoint::List::append(const Data &data) { - Q_ASSERT( !tqcontains(data) ); + Q_ASSERT( !contains(data) ); StateData sdata; sdata.data = data; _list.append(sdata); @@ -32,8 +32,8 @@ void Breakpoint::List::append(const Data &data) void Breakpoint::List::remove(const Data &data) { - Q_ASSERT( tqcontains(data) ); - _list.remove(tqfind(data)); + Q_ASSERT( contains(data) ); + _list.remove(find(data)); delayedChanged(); } @@ -43,7 +43,7 @@ void Breakpoint::List::clear() delayedChanged(); } -TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::tqfind(const Data &data) +TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::find(const Data &data) { TQValueList<StateData>::iterator it; for (it=_list.begin(); it!=_list.end(); ++it) @@ -51,7 +51,7 @@ TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::tqfind(cons return _list.end(); } -TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::tqfind(const Data &data) const +TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::find(const Data &data) const { TQValueList<StateData>::const_iterator it; for (it=_list.begin(); it!=_list.end(); ++it) @@ -61,14 +61,14 @@ TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::tqfin void Breakpoint::List::setState(const Data &data, State state) { - Q_ASSERT( tqcontains(data) ); - (*tqfind(data)).state = state; + Q_ASSERT( contains(data) ); + (*find(data)).state = state; delayedChanged(); } void Breakpoint::List::setAddress(const Data &data, Address address) { - Q_ASSERT( tqcontains(data) ); - (*tqfind(data)).address = address; + Q_ASSERT( contains(data) ); + (*find(data)).address = address; delayedChanged(); } diff --git a/src/progs/manager/breakpoint.h b/src/progs/manager/breakpoint.h index 07f5263..f0f1a5b 100644 --- a/src/progs/manager/breakpoint.h +++ b/src/progs/manager/breakpoint.h @@ -47,9 +47,9 @@ public: void clear(); uint count() const { return _list.count(); } const Data &data(uint i) const { return _list[i].data; } - bool tqcontains(const Data &data) const { return tqfind(data)!=_list.end(); } - State state(const Data &data) const { return (*tqfind(data)).state; } - Address address(const Data &data) const { return (*tqfind(data)).address; } + bool contains(const Data &data) const { return find(data)!=_list.end(); } + State state(const Data &data) const { return (*find(data)).state; } + Address address(const Data &data) const { return (*find(data)).address; } void setState(const Data &data, State state); void setAddress(const Data &data, Address address); @@ -62,8 +62,8 @@ private: State state; }; TQValueList<StateData> _list; - TQValueList<StateData>::const_iterator tqfind(const Data &data) const; - TQValueList<StateData>::iterator tqfind(const Data &data); + TQValueList<StateData>::const_iterator find(const Data &data) const; + TQValueList<StateData>::iterator find(const Data &data); }; } // namespace diff --git a/src/progs/manager/debug_manager.cpp b/src/progs/manager/debug_manager.cpp index 631a4bd..d8b88b2 100644 --- a/src/progs/manager/debug_manager.cpp +++ b/src/progs/manager/debug_manager.cpp @@ -331,7 +331,7 @@ void Debugger::Manager::setRegisterWatched(const Register::TypeData &data, bool bool Debugger::Manager::readRegister(const Register::TypeData &data) { Q_ASSERT( data.type()==Register::Regular || data.type()==Register::Special ); - if ( _readRegisters.tqcontains(data) ) return true; + if ( _readRegisters.contains(data) ) return true; BitValue value; if ( !debugger()->readRegister(data, value) ) return false; Register::list().setValue(data, value); |