Mercurial > octave-nkf
diff libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h @ 19628:fe689210525c gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 10:05:42 -0500 |
parents | 6e81b59d657c 446c46af4b42 |
children | 0e1f5a750d00 |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h Mon Jan 19 07:04:12 2015 +0100 +++ b/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h Tue Jan 20 10:05:42 2015 -0500 @@ -5,18 +5,18 @@ modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - + #ifndef Q_UNIXTERMINALIMPL #define Q_UNIXTERMINALIMPL @@ -37,7 +37,7 @@ QUnixTerminalImpl(QWidget *parent = 0); virtual ~QUnixTerminalImpl(); - void setTerminalFont(const QFont &font); + void setTerminalFont(const QFont &font); void setSize(int h, int v); void sendText(const QString& text); @@ -57,7 +57,7 @@ protected: void showEvent(QShowEvent *); - virtual void resizeEvent(QResizeEvent *); + virtual void resizeEvent(QResizeEvent *); private: void initialize();