Mercurial > hg > octave-lyh

changeset 16470:7369b210dbd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use pointer for terminal inside terminal_dock_widget * terminal-dock-widget.h, terminal-dock-widget.cc (terminal): Use pointer. Change all uses.
author John W. Eaton <jwe@octave.org>
date Mon, 08 Apr 2013 13:34:24 -0400
parents c89699ca005a
children d203a225cf11
files libgui/src/terminal-dock-widget.cc libgui/src/terminal-dock-widget.h
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/terminal-dock-widget.cc
+++ b/libgui/src/terminal-dock-widget.cc
@@ -28,15 +28,15 @@
 #include "terminal-dock-widget.h"
 
 terminal_dock_widget::terminal_dock_widget (QWidget *p)
-  : octave_dock_widget (p), terminal (p)
+  : octave_dock_widget (p), terminal (new QTerminal (p))
 {
-  terminal.setObjectName ("OctaveTerminal");
-  terminal.setFocusPolicy (Qt::StrongFocus);
+  terminal->setObjectName ("OctaveTerminal");
+  terminal->setFocusPolicy (Qt::StrongFocus);
 
   setObjectName ("TerminalDockWidget");
   setWindowIcon (QIcon(":/actions/icons/logo.png"));
   setWindowTitle (tr ("Command Window"));
-  setWidget (&terminal);
+  setWidget (terminal);
 
   connect (parent (), SIGNAL (settings_changed (const QSettings *)),
            this, SLOT (notice_settings (const QSettings *)));
@@ -50,16 +50,16 @@
   // Forward signals to QTerminal widget.
 
   connect (this, SIGNAL (notice_settings_signal (const QSettings *)),
-           &terminal, SLOT (notice_settings (const QSettings *)));
+           terminal, SLOT (notice_settings (const QSettings *)));
 
   connect (this, SIGNAL (relay_command_signal (const QString&)),
-           &terminal, SLOT (relay_command (const QString&)));
+           terminal, SLOT (relay_command (const QString&)));
 
   connect (this, SIGNAL (copyClipboard_signal (void)),
-           &terminal, SLOT (copyClipboard (void)));
+           terminal, SLOT (copyClipboard (void)));
 
   connect (this, SIGNAL (pasteClipboard_signal (void)),
-           &terminal, SLOT (pasteClipboard (void)));
+           terminal, SLOT (pasteClipboard (void)));
 }
 
 void
--- a/libgui/src/terminal-dock-widget.h
+++ b/libgui/src/terminal-dock-widget.h
@@ -63,7 +63,7 @@
 
 private:
 
-  QTerminal terminal;
+  QTerminal *terminal;
 };
 
 #endif // TERMINALDOCKWIDGET_H