rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up code

This commit is contained in:
Roy Qu 2022-10-18 12:46:51 +08:00
parent a62910e1a3
commit 0c305272c0
4 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
RedPandaIDE/editor.cpp
View File

@ -1209,18 +1209,10 @@ void Editor::mouseReleaseEvent(QMouseEvent *event)
QString s = document()->getString(p.line - 1);
if (mParser->isIncludeNextLine(s)) {
QString filename = mParser->getHeaderFileName(mFilename,s, true);
Editor * e = pMainWindow->editorList()->getEditorByFilename(filename);
if (e) {
e->setCaretPositionAndActivate(1,1);
return;
}
pMainWindow->openFile(filename,true);
} if (mParser->isIncludeLine(s)) {
QString filename = mParser->getHeaderFileName(mFilename,s);
Editor * e = pMainWindow->editorList()->getEditorByFilename(filename);
if (e) {
e->setCaretPositionAndActivate(1,1);
return;
}
pMainWindow->openFile(filename,true);
} else {
gotoDefinition(p);
return;
@ -3991,10 +3983,7 @@ void Editor::gotoDeclaration(const QSynedit::BufferCoord &pos)
filename = statement->fileName;
line = statement->line;
}
Editor* e = pMainWindow->editorList()->getEditorByFilename(filename);
if (e) {
e->setCaretPositionAndActivate(line,1);
}
pMainWindow->openFile(filename);
}
void Editor::gotoDefinition(const QSynedit::BufferCoord &pos)
@ -4020,10 +4009,7 @@ void Editor::gotoDefinition(const QSynedit::BufferCoord &pos)
filename = statement->definitionFileName;
line = statement->definitionLine;
}
Editor* e = pMainWindow->editorList()->getEditorByFilename(filename);
if (e) {
e->setCaretPositionAndActivate(line,1);
}
pMainWindow->openFile(filename);
}
QString getWordAtPosition(QSynedit::SynEdit *editor, const QSynedit::BufferCoord &p, QSynedit::BufferCoord &pWordBegin, QSynedit::BufferCoord &pWordEnd, Editor::WordPurpose purpose)

5
RedPandaIDE/editorlist.cpp
View File

@ -357,11 +357,6 @@ Editor* EditorList::getOpenedEditorByFilename(QString filename)
return nullptr;
}
Editor *EditorList::getEditorByFilename(QString filename)
{
return pMainWindow->openFile(filename,false);
}
bool EditorList::getContentFromOpenedEditor(const QString &filename, QStringList &buffer)
{
Editor * e= getOpenedEditorByFilename(filename);

2
RedPandaIDE/editorlist.h
View File

@ -55,8 +55,6 @@ public:
Editor* getOpenedEditorByFilename(QString filename);
Editor* getEditorByFilename(QString filename);
bool getContentFromOpenedEditor(const QString& filename, QStringList& buffer);
void getVisibleEditors(Editor*& left, Editor*& right);

43
RedPandaIDE/mainwindow.cpp
View File

@ -893,12 +893,12 @@ void MainWindow::setActiveBreakpoint(QString FileName, int Line, bool setFocus)
{
removeActiveBreakpoints();
// Then active the current line in the current file
Editor *e = mEditorList->getEditorByFilename(FileName);
Editor *e = openFile(FileName);
if (e!=nullptr) {
e->setActiveBreakpointFocus(Line,setFocus);
}
if (setFocus) {
this->activateWindow();
activateWindow();
}
}
@ -3475,9 +3475,7 @@ void MainWindow::onProblemSetIndexChanged(const QModelIndex &current, const QMod
ui->btnRemoveProblem->setEnabled(true);
POJProblem problem = mOJProblemSetModel.problem(idx.row());
if (problem && !problem->answerProgram.isEmpty()) {
Editor * editor =editorList()->getEditorByFilename(problem->answerProgram);
if (editor)
editor->activate();
openFile(problem->answerProgram);
}
mOJProblemModel.setProblem(problem);
updateProblemTitle();
@ -3851,10 +3849,7 @@ void MainWindow::onProblemOpenSource()
if (!problem)
return;
if (!problem->answerProgram.isEmpty()) {
Editor * editor = editorList()->getEditorByFilename(problem->answerProgram);
if (editor) {
editor->activate();
}
openFile(problem->answerProgram);
}
}
@ -4010,7 +4005,7 @@ void MainWindow::onClassBrowserGotoDefinition()
int line;
filename = statement->definitionFileName;
line = statement->definitionLine;
Editor* e = pMainWindow->editorList()->getEditorByFilename(filename);
Editor* e=openFile(filename);
if (e) {
e->setCaretPositionAndActivate(line,1);
}
@ -5219,7 +5214,7 @@ void MainWindow::on_tableIssues_doubleClicked(const QModelIndex &index)
if (!issue)
return;
Editor * editor = mEditorList->getEditorByFilename(issue->filename);
Editor * editor = openFile(issue->filename);
if (editor == nullptr)
return;
@ -5902,7 +5897,7 @@ void MainWindow::on_searchView_doubleClicked(const QModelIndex &index)
int start;
if (mSearchResultTreeModel->getItemFileAndLineChar(
index,filename,line,start)) {
Editor *e = mEditorList->getEditorByFilename(filename);
Editor *e = openFile(filename);
if (e) {
e->setCaretPositionAndActivate(line,start);
}
@ -5914,7 +5909,7 @@ void MainWindow::on_tblStackTrace_doubleClicked(const QModelIndex &index)
{
PTrace trace = mDebugger->backtraceModel()->backtrace(index.row());
if (trace) {
Editor *e = mEditorList->getEditorByFilename(trace->filename);
Editor *e = openFile(trace->filename);
if (e) {
e->setCaretPositionAndActivate(trace->line,1);
}
@ -5934,7 +5929,7 @@ void MainWindow::on_tblBreakpoints_doubleClicked(const QModelIndex &index)
index.row(),
mDebugger->isForProject());
if (breakpoint) {
Editor * e = mEditorList->getEditorByFilename(breakpoint->filename);
Editor * e = openFile(breakpoint->filename);
if (e) {
e->setCaretPositionAndActivate(breakpoint->line,1);
}
@ -6232,7 +6227,7 @@ void MainWindow::on_classBrowser_doubleClicked(const QModelIndex &index)
int line;
filename = statement->fileName;
line = statement->line;
Editor* e = pMainWindow->editorList()->getEditorByFilename(filename);
Editor* e = openFile(filename);
if (e) {
e->setCaretPositionAndActivate(line,1);
}
@ -6950,7 +6945,7 @@ void MainWindow::on_btnReplace_clicked()
QString newWord = ui->cbReplaceInHistory->currentText();
foreach (const PSearchResultTreeItem& file, results->results) {
QStringList contents;
Editor* editor = mEditorList->getEditorByFilename(file->filename);
Editor* editor = openFile(file->filename);
if (!editor) {
QMessageBox::critical(this,
tr("Replace Error"),
@ -7123,7 +7118,7 @@ void MainWindow::on_tableBookmark_doubleClicked(const QModelIndex &index)
return;
PBookmark bookmark = mBookmarkModel->bookmark(index.row());
if (bookmark) {
Editor *editor= mEditorList->getEditorByFilename(bookmark->filename);
Editor *editor= openFile(bookmark->filename);
if (editor) {
editor->setCaretPositionAndActivate(bookmark->line,1);
}
@ -7380,7 +7375,7 @@ void MainWindow::on_btnOpenProblemAnswer_clicked()
POJProblem problem = mOJProblemModel.problem();
if (!problem || problem->answerProgram.isEmpty())
return;
Editor *e = mEditorList->getEditorByFilename(problem->answerProgram);
Editor *e = openFile(problem->answerProgram);
if (e) {
e->activate();
}
@ -7636,10 +7631,7 @@ void MainWindow::on_actionNew_Header_triggered()
setProjectViewCurrentUnit(newUnit);
updateProjectView();
Editor * editor = mEditorList->getEditorByFilename(headerFilename);
if (editor){
editor->activate();
}
openFile(headerFilename);
}
pSettings->ui().setNewClassDialogWidth(dialog.width());
pSettings->ui().setNewClassDialogHeight(dialog.height());
@ -7709,11 +7701,8 @@ void MainWindow::on_actionNew_Class_triggered()
parseFileList(mProject->cppParser());
updateProjectView();
Editor * editor = mEditorList->getEditorByFilename(headerFilename);
if (editor){
editor->activate();
}
editor = mEditorList->getEditorByFilename(sourceFilename);
openFile(headerFilename);
openFile(sourceFilename,false);
}
pSettings->ui().setNewHeaderDialogWidth(dialog.width());
pSettings->ui().setNewHeaderDialogHeight(dialog.height());