Mercurial > octave

changeset 25955:53f559a78c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate temporary using declarations * color-picker.h, resource-manager.h, shortcut-manager.h, tab-bar.h: Eliminate using declarations now that settings_dialog is inside the octave namespace. * annotation-dialog.cc, QTerminal.h: Use explicit octave:: namespace tag to access resource_mananger.
author John W. Eaton <jwe@octave.org>
date Fri, 19 Oct 2018 14:22:30 -0400
parents f2406585a974
children 2201f82db233
files libgui/graphics/annotation-dialog.cc libgui/qterminal/libqterminal/QTerminal.h libgui/src/color-picker.h libgui/src/resource-manager.h libgui/src/shortcut-manager.h libgui/src/tab-bar.h
diffstat 6 files changed, 8 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/annotation-dialog.cc	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/graphics/annotation-dialog.cc	Fri Oct 19 14:22:30 2018 -0400
@@ -50,7 +50,7 @@
 {
   ui->setupUi (this);
 
-  QSettings *settings = resource_manager::get_settings ();
+  QSettings *settings = octave::resource_manager::get_settings ();
 
   // restore last geometry
   if (settings)
@@ -94,7 +94,7 @@
   QDialogButtonBox::ButtonRole button_role
     = ui->button_box->buttonRole (button);
 
-  QSettings *settings = resource_manager::get_settings ();
+  QSettings *settings = octave::resource_manager::get_settings ();
 
   // save position
   if (settings)
--- a/libgui/qterminal/libqterminal/QTerminal.h	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/qterminal/libqterminal/QTerminal.h	Fri Oct 19 14:22:30 2018 -0400
@@ -134,13 +134,13 @@
 
     _contextMenu = new QMenu (this);
 
-    _copy_action = _contextMenu->addAction (
-                     resource_manager::icon ("edit-copy"),
-                     tr ("Copy"), this, SLOT (copyClipboard ()));
+    _copy_action = _contextMenu->addAction
+      (octave::resource_manager::icon ("edit-copy"),
+       tr ("Copy"), this, SLOT (copyClipboard ()));
 
-    _paste_action = _contextMenu->addAction (
-                      resource_manager::icon ("edit-paste"),
-                      tr ("Paste"), this, SLOT (pasteClipboard ()));
+    _paste_action = _contextMenu->addAction
+     (octave::resource_manager::icon ("edit-paste"),
+      tr ("Paste"), this, SLOT (pasteClipboard ()));
 
     _contextMenu->addSeparator ();
 
--- a/libgui/src/color-picker.h	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/src/color-picker.h	Fri Oct 19 14:22:30 2018 -0400
@@ -56,8 +56,4 @@
   };
 }
 
-// FIXME: This is temporary and should be removed when all classes that
-// use the color_picker class are also inside the octave namespace.
-using octave::color_picker;
-
 #endif
--- a/libgui/src/resource-manager.h	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/src/resource-manager.h	Fri Oct 19 14:22:30 2018 -0400
@@ -175,8 +175,4 @@
   };
 }
 
-// FIXME: This is temporary and should be removed when all classes that
-// use the resource_manager class are also inside the octave namespace.
-using octave::resource_manager;
-
 #endif
--- a/libgui/src/shortcut-manager.h	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/src/shortcut-manager.h	Fri Oct 19 14:22:30 2018 -0400
@@ -201,8 +201,4 @@
   };
 }
 
-// FIXME: This is temporary and should be removed when all classes that
-// use the shortcut_manager class are also inside the octave namespace.
-using octave::shortcut_manager;
-
 #endif
--- a/libgui/src/tab-bar.h	Fri Oct 19 14:18:50 2018 -0400
+++ b/libgui/src/tab-bar.h	Fri Oct 19 14:22:30 2018 -0400
@@ -69,8 +69,4 @@
   };
 }
 
-// FIXME: This is temporary and should be removed when all classes that
-// use the tab_bar class are also inside the octave namespace.
-using octave::tab_bar;
-
 #endif