Mercurial > hg > octave-lojdl
changeset 13678:117ae3cb156e
Shifted IRCWidget.
| author | Jacob Dawid <jacob.dawid@googlemail.com> |
|---|---|
| date | Sun, 25 Sep 2011 21:12:47 +0200 |
| parents | f27573828e92 |
| children | e272af3f252d |
| files | gui/octave-gui.pro gui/src/HistoryDockWidget.cpp gui/src/HistoryDockWidget.h gui/src/IRCWidget.cpp gui/src/IRCWidget.h gui/src/VariablesDockWidget.cpp gui/src/VariablesDockWidget.h gui/src/qirc/IRCWidget.cpp gui/src/qirc/IRCWidget.h |
| diffstat | 7 files changed, 26 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/octave-gui.pro +++ b/gui/octave-gui.pro @@ -65,7 +65,7 @@ src/FileEditorMdiSubWindow.cpp \ src/BrowserWidget.cpp \ src/ImageViewerMdiSubWindow.cpp \ - src/IRCWidget.cpp \ + src/qirc/IRCWidget.cpp \ src/SettingsDialog.cpp \ src/OctaveGUI.cpp \ src/ResourceManager.cpp \ @@ -92,7 +92,7 @@ src/FileEditorMdiSubWindow.h \ src/BrowserWidget.h \ src/ImageViewerMdiSubWindow.h \ - src/IRCWidget.h \ + src/qirc/IRCWidget.h \ src/SettingsDialog.h \ src/ResourceManager.h \ src/CommandLineParser.h \
--- a/gui/src/HistoryDockWidget.cpp +++ b/gui/src/HistoryDockWidget.cpp @@ -63,12 +63,6 @@ } void -HistoryDockWidget::noticeSettings () -{ - -} - -void HistoryDockWidget::handleDoubleClick (QModelIndex modelIndex) { emit commandDoubleClicked (modelIndex.data().toString());
--- a/gui/src/HistoryDockWidget.h +++ b/gui/src/HistoryDockWidget.h @@ -32,8 +32,6 @@ void updateHistory (QStringList history); public slots: - /** Tells the widget to notice settings that are probably new. */ - void noticeSettings (); void handleVisibilityChanged (bool visible); signals:
--- a/gui/src/VariablesDockWidget.cpp +++ b/gui/src/VariablesDockWidget.cpp @@ -157,26 +157,26 @@ // will contain the appropriate QTreeWidgetItem* pointing at it. for (int i = 0; i < childCount; i++) { - child = topLevelItem->child (i); - if (child->data (0, 0).toString () == - QString (symbolRecord.name ().c_str ())) - { - alreadyExists = true; - break; - } + child = topLevelItem->child (i); + if (child->data (0, 0).toString () == + QString (symbolRecord.name ().c_str ())) + { + alreadyExists = true; + break; + } } // If it already exists, just update it. if (alreadyExists) { - updateTreeEntry (child, symbolRecord); + updateTreeEntry (child, symbolRecord); } else { - // It does not exist, so create a new one and set the right values. - child = new QTreeWidgetItem (); - updateTreeEntry (child, symbolRecord); - topLevelItem->addChild (child); + // It does not exist, so create a new one and set the right values. + child = new QTreeWidgetItem (); + updateTreeEntry (child, symbolRecord); + topLevelItem->addChild (child); } } @@ -186,30 +186,24 @@ bool existsInVariableList = false; QTreeWidgetItem *child = topLevelItem->child (i); foreach (SymbolRecord symbolRecord, symbolTable) - { - if (QString (symbolRecord.name ().c_str ()) == - child->data (0, 0).toString ()) - { - existsInVariableList = true; - } - } + { + if (QString (symbolRecord.name ().c_str ()) == + child->data (0, 0).toString ()) + { + existsInVariableList = true; + } + } if (!existsInVariableList) - { - topLevelItem->removeChild (child); - delete child; - i--; - } + { + topLevelItem->removeChild (child); + delete child; + i--; + } } } void -VariablesDockWidget::noticeSettings () -{ - -} - -void VariablesDockWidget::fetchSymbolTable () { QList < SymbolRecord > symbolTable = OctaveLink::instance ()->copyCurrentSymbolTable ();
--- a/gui/src/VariablesDockWidget.h +++ b/gui/src/VariablesDockWidget.h @@ -31,8 +31,6 @@ void setVariablesList (QList < SymbolRecord > symbolTable); public slots: - /** Tells the widget to notice settings that are probably new. */ - void noticeSettings (); void fetchSymbolTable (); void handleVisibilityChanged (bool visible); signals: