From fb9112c9ff4ae8380007e190ce68c8313ef46042 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 Nov 2023 02:18:34 +0900 Subject: Replaced various '#define' with actual strings - part 4 Signed-off-by: Michele Calgaro (cherry picked from commit 753b5724e1fdbfb87852395722717a9c1643baa3) --- src/libgui/breakpoint_view.cpp | 4 ++-- src/libgui/editor_manager.cpp | 2 +- src/libgui/gui_debug_manager.cpp | 14 +++++++------- src/libgui/project_manager.cpp | 2 +- src/tools/list/compile_process.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp index 5375cf4..a8454ea 100644 --- a/src/libgui/breakpoint_view.cpp +++ b/src/libgui/breakpoint_view.cpp @@ -71,13 +71,13 @@ void Breakpoint::View::itemClicked(TQListViewItem *item) if ( item==0 ) return; const Data &data = static_cast(item)->data(); Address address = Breakpoint::list().address(data); - TextEditor *editor = ::tqqt_cast(Main::currentEditor()); + TextEditor *editor = ::tqt_cast(Main::currentEditor()); const Coff::TextObject *coff = Debugger::manager->coff(); int line = -1; if ( coff && editor && editor->fileType()==PURL::Coff && address.isValid() ) line = coff->lineForAddress(editor->url(), address); if ( line==-1 ) { - editor = ::tqqt_cast(Main::editorManager().openEditor(data.url)); + editor = ::tqt_cast(Main::editorManager().openEditor(data.url)); line = data.line; } if ( editor==0 ) return; diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index 14da332..d6747f3 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -161,7 +161,7 @@ void EditorManager::updateTitles() static_cast(tabBar())->setReadOnly(indexOf(*it), (*it)->isReadOnly()); TQPixmap pixmap; 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; changeTab(*it, pixmap.isNull() ? def : pixmap, title(**it)); } diff --git a/src/libgui/gui_debug_manager.cpp b/src/libgui/gui_debug_manager.cpp index 365d37e..4b607ab 100644 --- a/src/libgui/gui_debug_manager.cpp +++ b/src/libgui/gui_debug_manager.cpp @@ -93,7 +93,7 @@ Breakpoint::Data Debugger::GuiManager::currentBreakpointData() { const Breakpoint::Data *data = Main::breakpointsView().currentData(); if (data) return *data; - TextEditor *editor = ::tqqt_cast(Main::currentEditor()); + TextEditor *editor = ::tqt_cast(Main::currentEditor()); Q_ASSERT(editor); return Breakpoint::Data(editor->url(), editor->cursorLine()); } @@ -183,7 +183,7 @@ void Debugger::GuiManager::updateView(bool gotoPC) bool currentHasPC = false; TQValueList::iterator ite; for (ite=_editors.begin(); ite!=_editors.end(); ++ite) { - TextEditor *e = ::tqqt_cast(*ite); + TextEditor *e = ::tqt_cast(*ite); if ( e==0 ) continue; updateEditorMarks(*e); 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 2: if ( !it.key().exists() ) continue; break; } - TextEditor *e = ::tqqt_cast(Main::editorManager().findEditor(it.key())); + TextEditor *e = ::tqt_cast(Main::editorManager().findEditor(it.key())); if ( e==0 ) { - if (gotoPC) e = ::tqqt_cast(Main::editorManager().openEditor(it.key())); + if (gotoPC) e = ::tqt_cast(Main::editorManager().openEditor(it.key())); if ( e==0 ) continue; } updateEditorMarks(*e); @@ -221,7 +221,7 @@ Register::MainView *Debugger::GuiManager::registerView() const { TQValueList::const_iterator it = _editors.begin(); for (; it!=_editors.end(); ++it) { - Register::MainView *rv = ::tqqt_cast(*it); + Register::MainView *rv = ::tqt_cast(*it); if (rv) return rv; } return 0; @@ -234,7 +234,7 @@ bool Debugger::GuiManager::isProjectSource(const PURL::Url &url) const void Debugger::GuiManager::showDisassemblyLocation() { - TextEditor *editor = ::tqqt_cast(Main::currentEditor()); + TextEditor *editor = ::tqt_cast(Main::currentEditor()); Q_ASSERT(editor); Q_ASSERT(_coff); TQValueVector
addresses = _coff->addresses(editor->url(), editor->cursorLine()); @@ -244,6 +244,6 @@ void Debugger::GuiManager::showDisassemblyLocation() } int line = _coff->lineForAddress(_coff->url(), addresses[0]); if ( line==-1 ) return; // possible ? - TextEditor *e = ::tqqt_cast(Main::editorManager().openEditor(_coff->url())); + TextEditor *e = ::tqt_cast(Main::editorManager().openEditor(_coff->url())); if (e) e->setCursor(line, 0); } diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index 68bf72c..bacf98a 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -458,7 +458,7 @@ void ProjectManager::View::clicked(int button, TQListViewItem *item, const TQPoi if ( fi->ftype()==PURL::Coff && _project==0 && !fi->url().exists() ) { PURL::Url url = findFileItem(PURL::Hex)->url(); if ( url.isEmpty() ) { - HexEditor *he = ::tqqt_cast(Main::currentEditor()); + HexEditor *he = ::tqt_cast(Main::currentEditor()); if ( he==0 ) break; e = new DisassemblyEditor(*he, *data, this); } else e = new DisassemblyEditor(url, *data, this); diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp index 7ba74a2..b19bc54 100644 --- a/src/tools/list/compile_process.cpp +++ b/src/tools/list/compile_process.cpp @@ -95,7 +95,7 @@ void Compile::LogWidget::lineClicked(int line) { if ( !_map.contains(line) ) return; PURL::Url url = PURL::Url::fromPathOrUrl(_map[line].filepath); - TextEditor *e = ::tqqt_cast(Main::editorManager().openEditor(url)); + TextEditor *e = ::tqt_cast(Main::editorManager().openEditor(url)); if ( e==0 ) return; e->setCursor(_map[line].line, 0); } -- cgit v1.2.3