diff --git a/addons/symbolviewer/bash_parser.cpp b/addons/symbolviewer/bash_parser.cpp --- a/addons/symbolviewer/bash_parser.cpp +++ b/addons/symbolviewer/bash_parser.cpp @@ -42,7 +42,7 @@ //It is necessary to change names m_func->setText(i18n("Show Functions")); - if(m_plugin->treeOn) + if(m_treeOn->isChecked()) { funcNode = new QTreeWidgetItem(m_symbols, QStringList(i18n("Functions") ) ); funcNode->setIcon(0, QIcon(func)); @@ -90,7 +90,7 @@ continue; funcName.append(QLatin1String("()")); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(funcNode, lastFuncNode); lastFuncNode = node; diff --git a/addons/symbolviewer/cpp_parser.cpp b/addons/symbolviewer/cpp_parser.cpp --- a/addons/symbolviewer/cpp_parser.cpp +++ b/addons/symbolviewer/cpp_parser.cpp @@ -44,7 +44,7 @@ KTextEditor::Document *kv = m_mainWindow->activeView()->document(); //qDebug(13000)<<"Lines counted :"<lines(); - if(m_plugin->treeOn) + if(m_treeOn->isChecked()) { mcrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Macros") ) ); sctNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Structures") ) ); @@ -110,7 +110,7 @@ stripped = stripped.trimmed(); if (m_macro->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mcrNode, lastMcrNode); lastMcrNode = node; @@ -148,7 +148,7 @@ } if(m_func->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); if (m_plugin->expandedOn) m_symbols->expandItem(node); @@ -260,7 +260,7 @@ ) ) stripped=stripped.right(stripped.length()-1); } - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { if (mclass == 4) { @@ -324,7 +324,7 @@ stripped.replace(QLatin1Char('}'), QLatin1String(" ")); if(m_struct->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(sctNode, lastSctNode); lastSctNode = node; diff --git a/addons/symbolviewer/ecma_parser.cpp b/addons/symbolviewer/ecma_parser.cpp --- a/addons/symbolviewer/ecma_parser.cpp +++ b/addons/symbolviewer/ecma_parser.cpp @@ -43,7 +43,7 @@ QPixmap mtd( ( const char** ) method_xpm ); QTreeWidgetItem *node = nullptr; - if (m_plugin->treeOn) { + if (m_treeOn->isChecked()) { m_symbols->setRootIsDecorated(1); } else { @@ -129,7 +129,7 @@ // trim whitespace identifier = identifier.trimmed(); // get the node to add the class entry to - if ((m_plugin->treeOn) && (! nodes.isEmpty())) { + if ((m_treeOn->isChecked()) && (! nodes.isEmpty())) { node = new QTreeWidgetItem(nodes.last()); if (m_plugin->expandedOn) m_symbols->expandItem(node); } @@ -205,7 +205,7 @@ if (! nodes.isEmpty()) { parent = nodes.last(); } - if ((m_plugin->treeOn) && (parent != nullptr)) + if ((m_treeOn->isChecked()) && (parent != nullptr)) node = new QTreeWidgetItem(parent); else node = new QTreeWidgetItem(m_symbols); @@ -252,7 +252,7 @@ if (! nodes.isEmpty()) { parent = nodes.last(); } - if ((m_plugin->treeOn) && (parent != nullptr)) + if ((m_treeOn->isChecked()) && (parent != nullptr)) node = new QTreeWidgetItem(parent); else node = new QTreeWidgetItem(m_symbols); diff --git a/addons/symbolviewer/fortran_parser.cpp b/addons/symbolviewer/fortran_parser.cpp --- a/addons/symbolviewer/fortran_parser.cpp +++ b/addons/symbolviewer/fortran_parser.cpp @@ -44,7 +44,7 @@ m_struct->setText(i18n("Show Modules")); m_func->setText(i18n("Show Functions")); - if(m_plugin->treeOn) + if(m_treeOn->isChecked()) { funcNode = new QTreeWidgetItem(m_symbols, QStringList(i18n("Functions") ) ); subrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Subroutines") ) ); @@ -150,7 +150,7 @@ stripped.prepend(QLatin1String("Main: ")); if(stripped.indexOf(QLatin1Char('='))==-1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(subrNode, lastSubrNode); lastSubrNode = node; @@ -190,7 +190,7 @@ } if(stripped.indexOf(QLatin1Char('='))==-1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(modNode, lastModNode); lastModNode = node; @@ -231,7 +231,7 @@ if(paro==parc && stripped.endsWith(QLatin1Char('&'))==false) { stripped.remove(QLatin1Char('&')); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(funcNode, lastFuncNode); lastFuncNode = node; diff --git a/addons/symbolviewer/perl_parser.cpp b/addons/symbolviewer/perl_parser.cpp --- a/addons/symbolviewer/perl_parser.cpp +++ b/addons/symbolviewer/perl_parser.cpp @@ -37,7 +37,7 @@ KTextEditor::Document *kv = m_mainWindow->activeView()->document(); //kdDebug(13000)<<"Lines counted :"<numLines()<treeOn) + if(m_treeOn->isChecked()) { mcrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Uses") ) ); sctNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Pragmas") ) ); @@ -83,7 +83,7 @@ QString stripped=cl.remove( QRegExp(QLatin1String("^use +")) ); //stripped=stripped.replace( QRegExp(QLatin1String(";$")), "" ); // Doesn't work ?? stripped = stripped.left(stripped.indexOf(QLatin1Char(';'))); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mcrNode, lastMcrNode); lastMcrNode = node; @@ -100,7 +100,7 @@ { QString stripped=cl.remove( QRegExp(QLatin1String("^use +")) ); stripped=stripped.remove( QRegExp(QLatin1String(";$")) ); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(sctNode, lastSctNode); lastMcrNode = node; @@ -118,7 +118,7 @@ { QString stripped=cl.remove( QRegExp(QLatin1String("^sub +")) ); stripped=stripped.remove( QRegExp(QLatin1String("[{;] *$")) ); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); lastClsNode = node; diff --git a/addons/symbolviewer/php_parser.cpp b/addons/symbolviewer/php_parser.cpp --- a/addons/symbolviewer/php_parser.cpp +++ b/addons/symbolviewer/php_parser.cpp @@ -36,7 +36,7 @@ KTextEditor::Document *kv = m_mainWindow->activeView()->document(); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { namespaceNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Namespaces") ) ); defineNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Defines") ) ); @@ -156,7 +156,7 @@ // detect NameSpaces if (namespaceRegExp.indexIn(line) != -1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(namespaceNode, lastNamespaceNode); if (m_plugin->expandedOn) @@ -177,7 +177,7 @@ // detect defines if (defineRegExp.indexIn(lineWithliterals) != -1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(defineNode, lastDefineNode); lastDefineNode = node; @@ -196,7 +196,7 @@ isInterface = interfaceRegExp.indexIn(line) != -1; if (isClass || isInterface) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(classNode, lastClassNode); if (m_plugin->expandedOn) @@ -253,7 +253,7 @@ // detect class constants if (constantRegExp.indexIn(line) != -1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(lastClassNode); } @@ -271,7 +271,7 @@ { if (varRegExp.indexIn(line) != -1) { - if (m_plugin->treeOn && inClass) + if (m_treeOn->isChecked() && inClass) { node = new QTreeWidgetItem(lastClassNode); } @@ -288,11 +288,11 @@ // detect functions if (functionRegExp.indexIn(line) != -1) { - if (m_plugin->treeOn && inClass) + if (m_treeOn->isChecked() && inClass) { node = new QTreeWidgetItem(lastClassNode); } - else if (m_plugin->treeOn) + else if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(lastFunctionNode); } diff --git a/addons/symbolviewer/plugin_katesymbolviewer.h b/addons/symbolviewer/plugin_katesymbolviewer.h --- a/addons/symbolviewer/plugin_katesymbolviewer.h +++ b/addons/symbolviewer/plugin_katesymbolviewer.h @@ -161,8 +161,6 @@ public: bool typesOn; bool expandedOn; - bool treeOn; - bool sortOn; private: KatePluginSymbolViewerView* m_view = nullptr; diff --git a/addons/symbolviewer/plugin_katesymbolviewer.cpp b/addons/symbolviewer/plugin_katesymbolviewer.cpp --- a/addons/symbolviewer/plugin_katesymbolviewer.cpp +++ b/addons/symbolviewer/plugin_katesymbolviewer.cpp @@ -97,14 +97,12 @@ KConfigGroup config(KSharedConfig::openConfig(), "PluginSymbolViewer"); m_plugin->typesOn = config.readEntry(QLatin1String("ViewTypes"), false); m_plugin->expandedOn = config.readEntry(QLatin1String("ExpandTree"), false); - m_plugin->treeOn = config.readEntry(QLatin1String("TreeView"), false); - m_plugin->sortOn = config.readEntry(QLatin1String("SortSymbols"), false); + m_treeOn->setChecked(config.readEntry(QLatin1String("TreeView"), false)); + m_sort->setChecked(config.readEntry(QLatin1String("SortSymbols"), false)); m_macro->setChecked(true); m_struct->setChecked(true); m_func->setChecked(true); - m_treeOn->setChecked(m_plugin->treeOn); - m_sort->setChecked(m_plugin->sortOn); m_updateTimer.setSingleShot(true); connect(&m_updateTimer, &QTimer::timeout, this, &KatePluginSymbolViewerView::slotRefreshSymbol); @@ -139,7 +137,7 @@ m_symbols->setHeaderLabels(titles); m_symbols->setColumnHidden(1, true); - m_symbols->setSortingEnabled(m_plugin->sortOn); + m_symbols->setSortingEnabled(m_sort->isChecked()); m_symbols->setRootIsDecorated(0); m_symbols->setContextMenuPolicy(Qt::CustomContextMenu); m_symbols->setIndentation(10); @@ -176,15 +174,11 @@ void KatePluginSymbolViewerView::slotChangeMode() { - m_plugin->treeOn = m_treeOn->isChecked(); parseSymbols(); } void KatePluginSymbolViewerView::slotEnableSorting() { - m_plugin->sortOn = m_sort->isChecked(); - m_symbols->setSortingEnabled(m_sort->isChecked()); - parseSymbols(); } @@ -398,11 +392,9 @@ typesOn = p->viewReturns->isChecked(); expandedOn = p->expandTree->isChecked(); - treeOn = p->treeView->isChecked(); - sortOn = p->sortSymbols->isChecked(); if (m_view) { - m_view->m_treeOn->setChecked(treeOn); - m_view->m_sort->setChecked(sortOn); + m_view->m_treeOn->setChecked(p->treeView->isChecked()); + m_view->m_sort->setChecked(p->sortSymbols->isChecked()); } } diff --git a/addons/symbolviewer/python_parser.cpp b/addons/symbolviewer/python_parser.cpp --- a/addons/symbolviewer/python_parser.cpp +++ b/addons/symbolviewer/python_parser.cpp @@ -39,7 +39,7 @@ KTextEditor::Document *kv = m_mainWindow->activeView()->document(); //kdDebug(13000)<<"Lines counted :"<numLines()<treeOn) + if(m_treeOn->isChecked()) { clsNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Classes") ) ); mcrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Globals") ) ); @@ -111,7 +111,7 @@ if (m_func->isChecked() && in_class == 1) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); if (m_plugin->expandedOn) m_symbols->expandItem(node); @@ -128,7 +128,7 @@ if (m_struct->isChecked() && in_class == 2) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mtdNode, lastMtdNode); lastMtdNode = node; @@ -142,7 +142,7 @@ if (m_macro->isChecked() && in_class == 0) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mcrNode, lastMcrNode); lastMcrNode = node; diff --git a/addons/symbolviewer/ruby_parser.cpp b/addons/symbolviewer/ruby_parser.cpp --- a/addons/symbolviewer/ruby_parser.cpp +++ b/addons/symbolviewer/ruby_parser.cpp @@ -39,7 +39,7 @@ KTextEditor::Document *kv = m_mainWindow->activeView()->document(); //kdDebug(13000)<<"Lines counted :"<numLines()<treeOn) + if(m_treeOn->isChecked()) { clsNode = new QTreeWidgetItem(m_symbols); clsNode->setText(0, i18n("Classes")); @@ -62,7 +62,7 @@ { if (m_func->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); if (m_plugin->expandedOn) m_symbols->expandItem(node); @@ -80,7 +80,7 @@ { if (m_struct->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mtdNode, lastMtdNode); lastMtdNode = node; diff --git a/addons/symbolviewer/tcl_parser.cpp b/addons/symbolviewer/tcl_parser.cpp --- a/addons/symbolviewer/tcl_parser.cpp +++ b/addons/symbolviewer/tcl_parser.cpp @@ -37,7 +37,7 @@ QPixmap mcr( ( const char** ) macro_xpm ); QPixmap cls( ( const char** ) class_xpm ); - if(m_plugin->treeOn) + if(m_treeOn->isChecked()) { clsNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Functions") ) ); mcrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Globals") ) ); @@ -90,7 +90,7 @@ //fnd = stripped.indexOf(QLatin1Char(';')); if(fnd > 0) stripped = stripped.left(fnd); - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mcrNode, lastMcrNode); lastMcrNode = node; @@ -131,7 +131,7 @@ //stripped = stripped.simplified(); if(m_func->isChecked()) { - if (m_plugin->treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); lastClsNode = node; diff --git a/addons/symbolviewer/xslt_parser.cpp b/addons/symbolviewer/xslt_parser.cpp --- a/addons/symbolviewer/xslt_parser.cpp +++ b/addons/symbolviewer/xslt_parser.cpp @@ -45,7 +45,7 @@ //kdDebug(13000)<<"Lines counted :"<numLines()<treeOn) + if(m_treeOn->isChecked()) { mcrNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Params") ) ); sctNode = new QTreeWidgetItem(m_symbols, QStringList( i18n("Variables") ) ); @@ -90,7 +90,7 @@ QString stripped = cl.remove(QRegExp(QLatin1String("^treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(mcrNode, lastMcrNode); lastMcrNode = node; @@ -106,7 +106,7 @@ QString stripped = cl.remove(QRegExp(QLatin1String("^treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(sctNode, lastSctNode); lastSctNode = node; @@ -122,7 +122,7 @@ QString stripped = cl.remove(QRegExp(QLatin1String("^treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); lastClsNode = node; @@ -138,7 +138,7 @@ QString stripped = cl.remove(QRegExp(QLatin1String("^treeOn) + if (m_treeOn->isChecked()) { node = new QTreeWidgetItem(clsNode, lastClsNode); lastClsNode = node;