Mercurial > hg > octave-nkf
changeset 16460:4d4e7c6f839d
use consistent names for dock-widget files
* documentation-dock-widget.cc: Rename from
documentation-dockwidget.cc. Change all uses.
* documentation-dock-widget.h: Rename from
documentation-dockwidget.h. Change all uses.
* files-dock-widget.cc: Rename from files-dockwidget.cc.
Change all uses.
* files-dock-widget.h: Rename from files-dockwidget.h.
Change all uses.
* history-dock-widget.cc: Rename from history-dockwidget.cc.
Change all uses.
* history-dock-widget.h: Rename from history-dockwidget.h.
Change all uses.
* terminal-dock-widget.cc: Rename from terminal-dockwidget.cc.
Change all uses.
* terminal-dock-widget.h: Rename from terminal-dockwidget.h.
Change all uses.
* libgui/src/module.mk: Update lists.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 07 Apr 2013 12:07:10 -0400 |
parents | cbc39a3d0c42 |
children | 094bd3627ead |
files | libgui/src/documentation-dock-widget.cc libgui/src/documentation-dock-widget.h libgui/src/documentation-dockwidget.cc libgui/src/documentation-dockwidget.h libgui/src/files-dock-widget.cc libgui/src/files-dock-widget.h libgui/src/files-dockwidget.cc libgui/src/files-dockwidget.h libgui/src/history-dock-widget.cc libgui/src/history-dock-widget.h libgui/src/history-dockwidget.cc libgui/src/history-dockwidget.h libgui/src/main-window.cc libgui/src/main-window.h libgui/src/module.mk libgui/src/terminal-dock-widget.cc libgui/src/terminal-dock-widget.h libgui/src/terminal-dockwidget.cc libgui/src/terminal-dockwidget.h |
diffstat | 11 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
rename from libgui/src/documentation-dockwidget.cc rename to libgui/src/documentation-dock-widget.cc --- a/libgui/src/documentation-dockwidget.cc +++ b/libgui/src/documentation-dock-widget.cc @@ -24,7 +24,7 @@ #include <config.h> #endif -#include "documentation-dockwidget.h" +#include "documentation-dock-widget.h" documentation_dock_widget::documentation_dock_widget (QWidget *p) : octave_dock_widget (p)
rename from libgui/src/files-dockwidget.cc rename to libgui/src/files-dock-widget.cc --- a/libgui/src/files-dockwidget.cc +++ b/libgui/src/files-dock-widget.cc @@ -25,7 +25,7 @@ #endif #include "resource-manager.h" -#include "files-dockwidget.h" +#include "files-dock-widget.h" #include <QApplication> #include <QFileInfo>
rename from libgui/src/history-dockwidget.cc rename to libgui/src/history-dock-widget.cc --- a/libgui/src/history-dockwidget.cc +++ b/libgui/src/history-dock-widget.cc @@ -33,7 +33,7 @@ #include "cmd-hist.h" -#include "history-dockwidget.h" +#include "history-dock-widget.h" history_dock_widget::history_dock_widget (QWidget *p) : octave_dock_widget (p)
--- a/libgui/src/main-window.cc +++ b/libgui/src/main-window.cc @@ -250,7 +250,7 @@ { QString name = obj->objectName (); if (obj->inherits ("QDockWidget") && ! name.isEmpty ()) - { // if children is a dockwidget with a name + { // if children is a dock widget with a name QDockWidget *widget = qobject_cast<QDockWidget *> (obj); icon = widget_icon_data[icon_set_found].path; // prefix or octave-logo if (widget_icon_data[icon_set_found].name != "NONE")
--- a/libgui/src/main-window.h +++ b/libgui/src/main-window.h @@ -47,10 +47,10 @@ #include "resource-manager.h" #include "workspace-model.h" #include "workspace-view.h" -#include "history-dockwidget.h" -#include "files-dockwidget.h" -#include "terminal-dockwidget.h" -#include "documentation-dockwidget.h" +#include "history-dock-widget.h" +#include "files-dock-widget.h" +#include "terminal-dock-widget.h" +#include "documentation-dock-widget.h" #include "octave-qt-event-listener.h" #include "octave-qt-link.h"
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -68,14 +68,14 @@ endif octave_gui_MOC += \ - src/moc-documentation-dockwidget.cc \ - src/moc-files-dockwidget.cc \ - src/moc-history-dockwidget.cc \ + src/moc-documentation-dock-widget.cc \ + src/moc-files-dock-widget.cc \ + src/moc-history-dock-widget.cc \ src/moc-main-window.cc \ src/moc-octave-qt-event-listener.cc \ src/moc-octave-qt-link.cc \ src/moc-settings-dialog.cc \ - src/moc-terminal-dockwidget.cc \ + src/moc-terminal-dock-widget.cc \ src/moc-color-picker.cc \ src/moc-welcome-wizard.cc \ src/moc-workspace-model.cc \ @@ -96,9 +96,9 @@ noinst_HEADERS += \ src/octave-dock-widget.h \ - src/documentation-dockwidget.h \ - src/files-dockwidget.h \ - src/history-dockwidget.h \ + src/documentation-dock-widget.h \ + src/files-dock-widget.h \ + src/history-dock-widget.h \ src/m-editor/file-editor-interface.h \ src/m-editor/file-editor-tab.h \ src/m-editor/file-editor.h \ @@ -114,16 +114,16 @@ src/resource-manager.h \ src/settings-dialog.h \ src/symbol-information.h \ - src/terminal-dockwidget.h \ + src/terminal-dock-widget.h \ src/color-picker.h \ src/welcome-wizard.h \ src/workspace-model.h \ src/workspace-view.h src_libgui_src_la_SOURCES = \ - src/documentation-dockwidget.cc \ - src/files-dockwidget.cc \ - src/history-dockwidget.cc \ + src/documentation-dock-widget.cc \ + src/files-dock-widget.cc \ + src/history-dock-widget.cc \ src/m-editor/file-editor-tab.cc \ src/m-editor/file-editor.cc \ src/m-editor/find-dialog.cc \ @@ -138,7 +138,7 @@ src/resource-manager.cc \ src/settings-dialog.cc \ src/symbol-information.cc \ - src/terminal-dockwidget.cc \ + src/terminal-dock-widget.cc \ src/color-picker.cc \ src/welcome-wizard.cc \ src/workspace-model.cc \
rename from libgui/src/terminal-dockwidget.cc rename to libgui/src/terminal-dock-widget.cc --- a/libgui/src/terminal-dockwidget.cc +++ b/libgui/src/terminal-dock-widget.cc @@ -25,7 +25,7 @@ #include <config.h> #endif -#include "terminal-dockwidget.h" +#include "terminal-dock-widget.h" terminal_dock_widget::terminal_dock_widget (QWidget *p) : octave_dock_widget (p), terminal (p)