summaryrefslogtreecommitdiffstats
path: root/src/libgui
diff options
context:
space:
mode:
Diffstat (limited to 'src/libgui')
-rw-r--r--src/libgui/breakpoint_view.cpp2
-rw-r--r--src/libgui/console.cpp2
-rw-r--r--src/libgui/device_gui.cpp2
-rw-r--r--src/libgui/gui_debug_manager.cpp16
-rw-r--r--src/libgui/likeback.cpp10
-rw-r--r--src/libgui/project_manager.cpp10
-rw-r--r--src/libgui/project_manager.h2
-rw-r--r--src/libgui/toplevel.cpp16
-rw-r--r--src/libgui/toplevel.h2
9 files changed, 31 insertions, 31 deletions
diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp
index 99f711f..3a8394f 100644
--- a/src/libgui/breakpoint_view.cpp
+++ b/src/libgui/breakpoint_view.cpp
@@ -20,7 +20,7 @@
//----------------------------------------------------------------------------
void Breakpoint::updateActions(const Data *data)
{
- bool hasBreakpoint = (data ? Breakpoint::list().tqcontains(*data) : false);
+ bool hasBreakpoint = (data ? Breakpoint::list().contains(*data) : false);
Main::action("toggle_breakpoint")->setText(hasBreakpoint ? i18n("Remove breakpoint") : i18n("Set breakpoint"));
Main::action("toggle_breakpoint")->setEnabled(data);
bool isActive = (hasBreakpoint ? Breakpoint::list().state(*data)==Breakpoint::Active : false);
diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp
index cff0c42..f090319 100644
--- a/src/libgui/console.cpp
+++ b/src/libgui/console.cpp
@@ -27,7 +27,7 @@ void ConsoleView::showEvent(TQShowEvent *e)
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
TQVBoxLayout *top = new TQVBoxLayout(this, 0, 10);
if ( factory==0 ) {
- TQLabel *label = new TQLabel(i18n("Could not tqfind \"konsolepart\"; please install kdebase."), this);
+ TQLabel *label = new TQLabel(i18n("Could not find \"konsolepart\"; please install kdebase."), this);
label->show();
top->addWidget(label);
return;
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index dc781a9..fae54f6 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -283,7 +283,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
switch (_listTypeCombo->value().type()) {
case ListType::FamilyTree: {
TQString gname = data->listViewGroup();
- if ( !groups.tqcontains(gname) )
+ if ( !groups.contains(gname) )
groups[gname] = new ListItem(_listView, gname, false, false);
item = new ListItem(groups[gname], list[i]);
break;
diff --git a/src/libgui/gui_debug_manager.cpp b/src/libgui/gui_debug_manager.cpp
index fdf0979..9ddf0e0 100644
--- a/src/libgui/gui_debug_manager.cpp
+++ b/src/libgui/gui_debug_manager.cpp
@@ -25,7 +25,7 @@
bool Debugger::GuiManager::addEditor(Editor &editor)
{
- if ( _editors.tqfind(&editor)!=_editors.end() ) return false;
+ if ( _editors.find(&editor)!=_editors.end() ) return false;
connect(&editor, TQT_SIGNAL(destroyed()), TQT_SLOT(editorDestroyed()));
_editors.append(&editor);
return true;
@@ -74,7 +74,7 @@ PURL::Url Debugger::GuiManager::coffUrl() const
bool Debugger::GuiManager::internalInit()
{
if ( !Manager::internalInit() ) return false;
- if ( !Main::projectManager().tqcontains(coffUrl()) )
+ if ( !Main::projectManager().contains(coffUrl()) )
Main::projectManager().addExternalFile(coffUrl(), ProjectManager::Generated);
Main::watchView().init(true);
if ( registerView() ) registerView()->view()->updateView();
@@ -105,7 +105,7 @@ void Debugger::GuiManager::toggleBreakpoint()
return;
}
Breakpoint::Data data = currentBreakpointData();
- if ( Breakpoint::list().tqcontains(data) ) {
+ if ( Breakpoint::list().contains(data) ) {
Breakpoint::list().remove(data);
return;
}
@@ -148,7 +148,7 @@ void Debugger::GuiManager::updateEditorMarks(TextEditor &editor) const
}
// update pc
if ( _coff && programmer() && programmer()->isActive() && pc().isInitialized() && !reached
- && _currentSourceLines.tqcontains(editor.url()) ) {
+ && _currentSourceLines.contains(editor.url()) ) {
int pcline = _currentSourceLines[editor.url()];
if ( programmer()->state()==Programmer::Halted ) editor.setMark(pcline, Breakpoint::ProgramCounterActive);
else editor.setMark(pcline, Breakpoint::ProgramCounterDisabled);
@@ -186,7 +186,7 @@ void Debugger::GuiManager::updateView(bool gotoPC)
TextEditor *e = ::tqqt_cast<TextEditor *>(*ite);
if ( e==0 ) continue;
updateEditorMarks(*e);
- if ( !_currentSourceLines.tqcontains(e->url()) ) continue;
+ if ( !_currentSourceLines.contains(e->url()) ) continue;
if (gotoPC) e->setCursor(_currentSourceLines[e->url()], 0);
if ( e==Main::currentEditor() ) currentHasPC = true;
}
@@ -198,8 +198,8 @@ void Debugger::GuiManager::updateView(bool gotoPC)
TQMap<PURL::Url, uint>::const_iterator it;
for (it=_currentSourceLines.begin(); it!=_currentSourceLines.end(); ++it) {
switch (i) {
- case 0: if ( !Main::projectManager().tqcontains(it.key()) || Main::projectManager().isExternalFile(it.key()) ) continue; break;
- case 1: if ( !Main::projectManager().tqcontains(it.key()) ) continue; break;
+ case 0: if ( !Main::projectManager().contains(it.key()) || Main::projectManager().isExternalFile(it.key()) ) continue; break;
+ case 1: if ( !Main::projectManager().contains(it.key()) ) continue; break;
case 2: if ( !it.key().exists() ) continue; break;
}
TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().findEditor(it.key()));
@@ -229,7 +229,7 @@ Register::MainView *Debugger::GuiManager::registerView() const
bool Debugger::GuiManager::isProjectSource(const PURL::Url &url) const
{
- return ( Main::projectManager().tqcontains(url) && !Main::projectManager().isExternalFile(url) );
+ return ( Main::projectManager().contains(url) && !Main::projectManager().isExternalFile(url) );
}
void Debugger::GuiManager::showDisassemblyLocation()
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index c174bbc..11fa9b9 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -408,11 +408,11 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
{
TQString theVersion = (version.isEmpty() ? s_about->version() : version);
- return theVersion.tqfind("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
- theVersion.tqfind("beta", /*index=*/0, /*caseSensitive=*/false) != -1 ||
- theVersion.tqfind("rc", /*index=*/0, /*caseSensitive=*/false) != -1 ||
- theVersion.tqfind("svn", /*index=*/0, /*caseSensitive=*/false) != -1 ||
- theVersion.tqfind("cvs", /*index=*/0, /*caseSensitive=*/false) != -1;
+ return theVersion.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
+ theVersion.find("beta", /*index=*/0, /*caseSensitive=*/false) != -1 ||
+ theVersion.find("rc", /*index=*/0, /*caseSensitive=*/false) != -1 ||
+ theVersion.find("svn", /*index=*/0, /*caseSensitive=*/false) != -1 ||
+ theVersion.find("cvs", /*index=*/0, /*caseSensitive=*/false) != -1;
}
void LikeBack::init(KConfig* config, KAboutData* about, Button buttons)
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index e606370..931901e 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -189,7 +189,7 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i
} else {
pop.insertTitle(i18n("Project"));
pop.insertItem("configure", i18n("Options..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(configureProject()));
- pop.insertItem("tqfind", i18n("Find Files..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(runKtqfind()));
+ pop.insertItem("find", i18n("Find Files..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(runKfind()));
pop.insertSeparator();
pop.insertItem("piklab_compile", i18n("Build Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(buildProject()));
pop.insertItem("trashcan_empty", i18n("Clean Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(cleanBuild()));
@@ -274,7 +274,7 @@ PURL::Url ProjectManager::View::standaloneGenerator(const PURL::Url &url, PURL::
{
TQMap<PURL::Url, ProjectData>::const_iterator it;
for (it=_standaloneData.begin(); it!=_standaloneData.end(); ++it) {
- if ( !it.data().externals.tqcontains(url) ) continue;
+ if ( !it.data().externals.contains(url) ) continue;
if ( !it.key().exists() ) continue;
type = it.data().type;
return it.key();
@@ -315,7 +315,7 @@ void ProjectManager::View::insertFile(const PURL::Url &url)
if ( copy==MessageBox::Cancel ) return;
if ( copy==MessageBox::Yes ) purl = PURL::Url(_project->directory(), url.filename());
}
- if ( _project->absoluteFiles().tqcontains(purl) ) {
+ if ( _project->absoluteFiles().contains(purl) ) {
MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").tqarg(purl.pretty()), Log::Show);
return;
}
@@ -356,7 +356,7 @@ ProjectManager::View::ProjectData &ProjectManager::View::projectData()
void ProjectManager::View::addFile(const PURL::Url &url, PURL::FileType type, FileOrigin origin)
{
- if ( tqcontains(url) ) return;
+ if ( contains(url) ) return;
TQMap<PURL::Url, FileOrigin> &ext = projectData().externals;
if ( type.data().group==PURL::LinkerScript && _linkerScriptItem ) {
_linkerScriptItem->set(url);
@@ -551,7 +551,7 @@ bool ProjectManager::View::openProject(const PURL::Url &url)
bool ProjectManager::View::isExternalFile(const PURL::Url &url) const
{
if ( projectUrl().isEmpty() ) return false;
- return projectData().externals.tqcontains(url);
+ return projectData().externals.contains(url);
}
void ProjectManager::View::modified(const PURL::Url &url)
diff --git a/src/libgui/project_manager.h b/src/libgui/project_manager.h
index 6151713..8c33579 100644
--- a/src/libgui/project_manager.h
+++ b/src/libgui/project_manager.h
@@ -44,7 +44,7 @@ public:
void removeFile(const PURL::Url &url);
void select(const Editor *e);
void insertFile(const PURL::Url &url);
- bool tqcontains(const PURL::Url &url) const { return findFileItem(url); }
+ bool contains(const PURL::Url &url) const { return findFileItem(url); }
void addExternalFile(const PURL::Url &url, FileOrigin fileOrigin);
bool isExternalFile(const PURL::Url &url) const;
void removeExternalFiles();
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index 1acb52e..fa70706 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -307,8 +307,8 @@ MainWindow::MainWindow()
// tools
(void)new KAction(i18n("&Pikloops..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops");
- (void)new KAction(i18n("&Find Files..."), "tqfind", 0,
- TQT_TQOBJECT(this), TQT_SLOT(runKtqfind()), actionCollection(), "tools_ktqfind");
+ (void)new KAction(i18n("&Find Files..."), "find", 0,
+ TQT_TQOBJECT(this), TQT_SLOT(runKfind()), actionCollection(), "tools_kfind");
(void)new KAction(i18n("&Device Information..."), "info", 0,
TQT_TQOBJECT(this), TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information");
(void)new KAction(i18n("&Config Generator..."), 0, 0,
@@ -595,7 +595,7 @@ void MainWindow::updateGUI()
Main::action("show_disassembly_location")->setEnabled(Debugger::manager->coff()!=0 && (isSource || isHeader));
// update project
- bool inProject = ( Main::currentEditor() && (currentType==PURL::Nb_FileTypes || Main::currentEditor()->url().isEmpty() || Main::_projectManager->tqcontains(Main::currentEditor()->url())) );
+ bool inProject = ( Main::currentEditor() && (currentType==PURL::Nb_FileTypes || Main::currentEditor()->url().isEmpty() || Main::_projectManager->contains(Main::currentEditor()->url())) );
if ( Main::project()==0 && !inProject ) {
if ( Main::currentEditor()==0 ) Main::_projectManager->closeProject();
else if ( isSource ) Main::_projectManager->setStandalone(Main::currentEditor()->url(), currentType);
@@ -637,7 +637,7 @@ void MainWindow::updateGUI()
_programmertqStatus->widget()->setFont(f);
bool isProgrammer = ( Main::programmerGroup().properties() & ::Programmer::Programmer );
PURL::Url purl = Main::_projectManager->projectUrl();
- bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->tqcontains(purl.toFileType(PURL::Hex)) );
+ bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->contains(purl.toFileType(PURL::Hex)) );
Main::action("prog_connect")->setEnabled(isProgrammer && idle);
Main::action("prog_read")->setEnabled(isProgrammer && idle);
Main::action("prog_program")->setEnabled(isProgrammer && hasHex && idle);
@@ -702,17 +702,17 @@ void MainWindow::toggleToolView(TQWidget *widget)
static_cast<KDockWidget *>(widget)->changeHideShowState();
}
-void MainWindow::runKtqfind()
+void MainWindow::runKfind()
{
if (_kfindProcess) return;
_kfindProcess = new ::Process::StringOutput;
TQString path;
PURL::Url url = Main::projectManager().projectUrl();
if ( !url.isEmpty() ) path = url.path();
- _kfindProcess->setup("ktqfind", path, false);
+ _kfindProcess->setup("kfind", path, false);
connect(_kfindProcess, TQT_SIGNAL(done(int)), TQT_SLOT(kfindDone()));
if ( !_kfindProcess->start(0) )
- MessageBox::sorry(i18n("Could not run \"ktqfind\""), Log::Show);
+ MessageBox::sorry(i18n("Could not run \"kfind\""), Log::Show);
}
void MainWindow::kfindDone()
@@ -934,7 +934,7 @@ void MainWindow::program()
{
HexEditor *editor = getHexEditor();
if ( editor==0 ) return;
- if ( Main::programmerGroup().isDebugger() && !Main::_projectManager->tqcontains(editor->url()) ) {
+ if ( Main::programmerGroup().isDebugger() && !Main::_projectManager->contains(editor->url()) ) {
MessageBox::sorry(i18n("It is not possible to start a debugging session with an hex file not generated with the current project."), Log::Show);
return;
}
diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h
index d3e78be..ea36c93 100644
--- a/src/libgui/toplevel.h
+++ b/src/libgui/toplevel.h
@@ -42,7 +42,7 @@ public slots:
void configureProject();
void showDeviceInfo();
void runPikloops();
- void runKtqfind();
+ void runKfind();
void configGenerator();
void templateGenerator();
void updateGUI();
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-14 16:58:15 +0000