Replaced various '#define' with actual strings - part 4

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/7/head
Michele Calgaro 6 months ago
parent e556daea65
commit 753b5724e1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -71,13 +71,13 @@ void Breakpoint::View::itemClicked(TQListViewItem *item)
if ( item==0 ) return; if ( item==0 ) return;
const Data &data = static_cast<ListViewItem *>(item)->data(); const Data &data = static_cast<ListViewItem *>(item)->data();
Address address = Breakpoint::list().address(data); Address address = Breakpoint::list().address(data);
TextEditor *editor = ::tqqt_cast<TextEditor *>(Main::currentEditor()); TextEditor *editor = ::tqt_cast<TextEditor *>(Main::currentEditor());
const Coff::TextObject *coff = Debugger::manager->coff(); const Coff::TextObject *coff = Debugger::manager->coff();
int line = -1; int line = -1;
if ( coff && editor && editor->fileType()==PURL::Coff && address.isValid() ) if ( coff && editor && editor->fileType()==PURL::Coff && address.isValid() )
line = coff->lineForAddress(editor->url(), address); line = coff->lineForAddress(editor->url(), address);
if ( line==-1 ) { if ( line==-1 ) {
editor = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(data.url)); editor = ::tqt_cast<TextEditor *>(Main::editorManager().openEditor(data.url));
line = data.line; line = data.line;
} }
if ( editor==0 ) return; if ( editor==0 ) return;

@ -161,7 +161,7 @@ void EditorManager::updateTitles()
static_cast<EditorTabBar *>(tabBar())->setReadOnly(indexOf(*it), (*it)->isReadOnly()); static_cast<EditorTabBar *>(tabBar())->setReadOnly(indexOf(*it), (*it)->isReadOnly());
TQPixmap pixmap; TQPixmap pixmap;
if ( (*it)->isModified() ) pixmap = modified; if ( (*it)->isModified() ) pixmap = modified;
else if ( ::tqqt_cast< ::DeviceEditor *>(*it)==0 ) pixmap = PURL::icon((*it)->fileType()); else if ( ::tqt_cast< ::DeviceEditor *>(*it)==0 ) pixmap = PURL::icon((*it)->fileType());
else pixmap = chip; else pixmap = chip;
changeTab(*it, pixmap.isNull() ? def : pixmap, title(**it)); changeTab(*it, pixmap.isNull() ? def : pixmap, title(**it));
} }

@ -93,7 +93,7 @@ Breakpoint::Data Debugger::GuiManager::currentBreakpointData()
{ {
const Breakpoint::Data *data = Main::breakpointsView().currentData(); const Breakpoint::Data *data = Main::breakpointsView().currentData();
if (data) return *data; if (data) return *data;
TextEditor *editor = ::tqqt_cast<TextEditor *>(Main::currentEditor()); TextEditor *editor = ::tqt_cast<TextEditor *>(Main::currentEditor());
Q_ASSERT(editor); Q_ASSERT(editor);
return Breakpoint::Data(editor->url(), editor->cursorLine()); return Breakpoint::Data(editor->url(), editor->cursorLine());
} }
@ -183,7 +183,7 @@ void Debugger::GuiManager::updateView(bool gotoPC)
bool currentHasPC = false; bool currentHasPC = false;
TQValueList<Editor *>::iterator ite; TQValueList<Editor *>::iterator ite;
for (ite=_editors.begin(); ite!=_editors.end(); ++ite) { for (ite=_editors.begin(); ite!=_editors.end(); ++ite) {
TextEditor *e = ::tqqt_cast<TextEditor *>(*ite); TextEditor *e = ::tqt_cast<TextEditor *>(*ite);
if ( e==0 ) continue; if ( e==0 ) continue;
updateEditorMarks(*e); updateEditorMarks(*e);
if ( !_currentSourceLines.contains(e->url()) ) continue; if ( !_currentSourceLines.contains(e->url()) ) continue;
@ -202,9 +202,9 @@ void Debugger::GuiManager::updateView(bool gotoPC)
case 1: if ( !Main::projectManager().contains(it.key()) ) continue; break; case 1: if ( !Main::projectManager().contains(it.key()) ) continue; break;
case 2: if ( !it.key().exists() ) continue; break; case 2: if ( !it.key().exists() ) continue; break;
} }
TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().findEditor(it.key())); TextEditor *e = ::tqt_cast<TextEditor *>(Main::editorManager().findEditor(it.key()));
if ( e==0 ) { if ( e==0 ) {
if (gotoPC) e = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(it.key())); if (gotoPC) e = ::tqt_cast<TextEditor *>(Main::editorManager().openEditor(it.key()));
if ( e==0 ) continue; if ( e==0 ) continue;
} }
updateEditorMarks(*e); updateEditorMarks(*e);
@ -221,7 +221,7 @@ Register::MainView *Debugger::GuiManager::registerView() const
{ {
TQValueList<Editor *>::const_iterator it = _editors.begin(); TQValueList<Editor *>::const_iterator it = _editors.begin();
for (; it!=_editors.end(); ++it) { for (; it!=_editors.end(); ++it) {
Register::MainView *rv = ::tqqt_cast<Register::MainView *>(*it); Register::MainView *rv = ::tqt_cast<Register::MainView *>(*it);
if (rv) return rv; if (rv) return rv;
} }
return 0; return 0;
@ -234,7 +234,7 @@ bool Debugger::GuiManager::isProjectSource(const PURL::Url &url) const
void Debugger::GuiManager::showDisassemblyLocation() void Debugger::GuiManager::showDisassemblyLocation()
{ {
TextEditor *editor = ::tqqt_cast<TextEditor *>(Main::currentEditor()); TextEditor *editor = ::tqt_cast<TextEditor *>(Main::currentEditor());
Q_ASSERT(editor); Q_ASSERT(editor);
Q_ASSERT(_coff); Q_ASSERT(_coff);
TQValueVector<Address> addresses = _coff->addresses(editor->url(), editor->cursorLine()); TQValueVector<Address> addresses = _coff->addresses(editor->url(), editor->cursorLine());
@ -244,6 +244,6 @@ void Debugger::GuiManager::showDisassemblyLocation()
} }
int line = _coff->lineForAddress(_coff->url(), addresses[0]); int line = _coff->lineForAddress(_coff->url(), addresses[0]);
if ( line==-1 ) return; // possible ? if ( line==-1 ) return; // possible ?
TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(_coff->url())); TextEditor *e = ::tqt_cast<TextEditor *>(Main::editorManager().openEditor(_coff->url()));
if (e) e->setCursor(line, 0); if (e) e->setCursor(line, 0);
} }

@ -458,7 +458,7 @@ void ProjectManager::View::clicked(int button, TQListViewItem *item, const TQPoi
if ( fi->ftype()==PURL::Coff && _project==0 && !fi->url().exists() ) { if ( fi->ftype()==PURL::Coff && _project==0 && !fi->url().exists() ) {
PURL::Url url = findFileItem(PURL::Hex)->url(); PURL::Url url = findFileItem(PURL::Hex)->url();
if ( url.isEmpty() ) { if ( url.isEmpty() ) {
HexEditor *he = ::tqqt_cast<HexEditor *>(Main::currentEditor()); HexEditor *he = ::tqt_cast<HexEditor *>(Main::currentEditor());
if ( he==0 ) break; if ( he==0 ) break;
e = new DisassemblyEditor(*he, *data, this); e = new DisassemblyEditor(*he, *data, this);
} else e = new DisassemblyEditor(url, *data, this); } else e = new DisassemblyEditor(url, *data, this);

@ -95,7 +95,7 @@ void Compile::LogWidget::lineClicked(int line)
{ {
if ( !_map.contains(line) ) return; if ( !_map.contains(line) ) return;
PURL::Url url = PURL::Url::fromPathOrUrl(_map[line].filepath); PURL::Url url = PURL::Url::fromPathOrUrl(_map[line].filepath);
TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(url)); TextEditor *e = ::tqt_cast<TextEditor *>(Main::editorManager().openEditor(url));
if ( e==0 ) return; if ( e==0 ) return;
e->setCursor(_map[line].line, 0); e->setCursor(_map[line].line, 0);
} }

Loading…
Cancel
Save