GNOME.org
 

nemiver r876 - in trunk: . src/persp/dbgperspective

Author: dodji
Date: Sat Jun 28 10:32:55 2008
New Revision: 876
URL: http://svn.gnome.org/viewvc/nemiver?rev=876&view=rev

Log:
swtich to variable walker for real

	* src/persp/dbgperspective/Makefile.am: Remove
	  nmv-var-inspector.[h|cc], nmv-var-inspector.[cc|h],
	  nmv-variables-utils.[cc|h] because their 'variable-walker'
	  enabled counterpart are now solid enough to take over.
	* src/persp/dbgperspective/*.cc,h: Ditto.
	* src/persp/dbgperspective/nmv-dbg-perspective.cc,
	  src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc,
	  src/persp/dbgperspective/nmv-local-vars-inspector2.cc,
	  src/persp/dbgperspective/nmv-var-inspector-dialog.cc,
	  src/persp/dbgperspective/nmv-var-inspector2.cc,
	  src/persp/dbgperspective/nmv-variables-utils2.cc: switch
	  unconditionnaly to variable walker.
	* configure.ac: Don't propse the --enable-variable-walker anymore.


Removed:
   trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
   trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h
   trunk/src/persp/dbgperspective/nmv-var-inspector.cc
   trunk/src/persp/dbgperspective/nmv-var-inspector.h
   trunk/src/persp/dbgperspective/nmv-variables-utils.cc
   trunk/src/persp/dbgperspective/nmv-variables-utils.h
Modified:
   trunk/ChangeLog
   trunk/config.h.in
   trunk/configure.ac
   trunk/src/persp/dbgperspective/Makefile.am
   trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
   trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc
   trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
   trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
   trunk/src/persp/dbgperspective/nmv-var-inspector2.cc
   trunk/src/persp/dbgperspective/nmv-variables-utils2.cc

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Sat Jun 28 10:32:55 2008
@@ -102,9 +102,6 @@
 /* build with gtksourceviewmm 2.x instead of 1.x */
 #undef WITH_SOURCEVIEWMM2
 
-/* enable variables walker interface */
-#undef WITH_VARIABLE_WALKER
-
 /* compile the workbench */
 #undef WITH_WORKBENCH
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jun 28 10:32:55 2008
@@ -210,18 +210,6 @@
               ENABLE_GCC_SYMBOLS_VISIBILITY=$enableval,
               ENABLE_GCC_SYMBOLS_VISIBILITY=no)
 
-ENABLE_VARIABLE_WALKER=yes
-AC_ARG_ENABLE(variable-walker,
-              AC_HELP_STRING([--enable-variable-walker],
-                             [enable the variable walker interface. default is enabled]),
-              ENABLE_VARIABLE_WALKER=$enableval,
-              ENABLE_VARIABLE_WALKER=yes)
-if test x$ENABLE_VARIABLE_WALKER = xyes ; then
-    AC_DEFINE([WITH_VARIABLE_WALKER], 1, [enable variables walker interface])
-    AC_MSG_NOTICE([enabled variable walker])
-else
-    AC_MSG_NOTICE([disabled variable walker])
-fi
 
 dnl *******************************
 dnl checking for libraries we use
@@ -466,7 +454,6 @@
     Enable memory view              : ${ENABLE_MEMORYVIEW} (requires gtkhex > $GTKHEX_VERSION)
     gtksourceviewmm version         : ${LIBGTKSOURCEVIEWMM_PKG}
     VFS library                     : ${VFS_PKG}
-    Enable variable walker          : ${ENABLE_VARIABLE_WALKER}
     Enable symbols visibility ctrl  : ${ENABLE_GCC_SYMBOLS_VISIBILITY}
     Maintainer mode                 : ${USER_MAINTAINER_MODE}
 

Modified: trunk/src/persp/dbgperspective/Makefile.am
==============================================================================
--- trunk/src/persp/dbgperspective/Makefile.am	(original)
+++ trunk/src/persp/dbgperspective/Makefile.am	Sat Jun 28 10:32:55 2008
@@ -46,18 +46,12 @@
 nmv-sess-mgr.h \
 nmv-call-stack.cc \
 nmv-call-stack.h \
-nmv-variables-utils.cc \
-nmv-variables-utils.h \
 nmv-variables-utils2.cc \
 nmv-variables-utils2.h \
-nmv-local-vars-inspector.cc \
-nmv-local-vars-inspector.h \
 nmv-local-vars-inspector2.cc \
 nmv-local-vars-inspector2.h \
 nmv-global-vars-inspector-dialog.cc \
 nmv-global-vars-inspector-dialog.h \
-nmv-var-inspector.cc \
-nmv-var-inspector.h \
 nmv-var-inspector2.cc \
 nmv-var-inspector2.h \
 nmv-breakpoints-view.cc \

Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	Sat Jun 28 10:32:55 2008
@@ -69,11 +69,7 @@
 #include "nmv-call-stack.h"
 #include "nmv-spinner-tool-item.h"
 
-#ifndef WITH_VARIABLE_WALKER
-#include "nmv-local-vars-inspector.h"
-#else
 #include "nmv-local-vars-inspector2.h"
-#endif
 
 #include "nmv-global-vars-inspector-dialog.h"
 #include "nmv-terminal.h"
@@ -540,11 +536,7 @@
 
     Gtk::HPaned& get_call_stack_paned () ;
 
-#ifndef WITH_VARIABLE_WALKER
-    LocalVarsInspector& get_local_vars_inspector () ;
-#else
     LocalVarsInspector2& get_local_vars_inspector () ;
-#endif
 
     Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win () ;
 
@@ -743,11 +735,7 @@
 #endif // WITH_GIO
     Path2MonitorMap path_2_monitor_map;
     Gtk::Notebook *statuses_notebook ;
-#ifndef WITH_VARIABLE_WALKER
-    SafePtr<LocalVarsInspector> variables_editor ;
-#else
     SafePtr<LocalVarsInspector2> variables_editor ;
-#endif
     SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win ;
     SafePtr<Terminal> terminal ;
     SafePtr<Gtk::Box> terminal_box ;
@@ -5569,11 +5557,7 @@
     return *m_priv->thread_list_scrolled_win ;
 }
 
-#ifndef WITH_VARIABLE_WALKER
-LocalVarsInspector&
-#else
 LocalVarsInspector2&
-#endif
 DBGPerspective::get_local_vars_inspector ()
 {
     THROW_IF_FAIL (m_priv) ;
@@ -5581,13 +5565,9 @@
 
     if (!m_priv->variables_editor) {
         m_priv->variables_editor.reset
-#ifndef WITH_VARIABLE_WALKER
-            (new LocalVarsInspector (debugger (), *m_priv->workbench)) ;
-#else
             (new LocalVarsInspector2 (debugger (),
                                       *m_priv->workbench,
                                       *this)) ;
-#endif
     }
     THROW_IF_FAIL (m_priv->variables_editor) ;
     return *m_priv->variables_editor ;

Modified: trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc	Sat Jun 28 10:32:55 2008
@@ -24,8 +24,6 @@
  */
 #include "config.h"
 
-#ifdef WITH_VARIABLE_WALKER
-
 #include <map>
 #include <list>
 #include <glib/gi18n.h>
@@ -327,5 +325,3 @@
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VARIABLE_WALKER
-

Modified: trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-local-vars-inspector2.cc	Sat Jun 28 10:32:55 2008
@@ -24,8 +24,6 @@
  */
 #include "config.h"
 
-#ifdef WITH_VARIABLE_WALKER
-
 #include <map>
 #include <list>
 #include <glib/gi18n.h>
@@ -819,5 +817,3 @@
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VARIABLE_WALKER
-

Modified: trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc	Sat Jun 28 10:32:55 2008
@@ -26,11 +26,7 @@
 #include <glib/gi18n.h>
 #include "common/nmv-exception.h"
 #include "nmv-var-inspector-dialog.h"
-#ifndef WITH_VARIABLE_WALKER
-#include "nmv-var-inspector.h"
-#else
 #include "nmv-var-inspector2.h"
-#endif
 #include "nmv-ui-utils.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -39,11 +35,7 @@
     friend class VarInspectorDialog ;
     Gtk::Entry *var_name_entry ;
     Gtk::Button *inspect_button ;
-#ifndef WITH_VARIABLE_WALKER
-    SafePtr<VarInspector> var_inspector ;
-#else
     SafePtr<VarInspector2> var_inspector ;
-#endif
     Gtk::Dialog &dialog ;
     Glib::RefPtr<Gnome::Glade::Xml> glade ;
     IDebuggerSafePtr debugger ;
@@ -80,11 +72,7 @@
         Gtk::Box *box =
             ui_utils::get_widget_from_glade<Gtk::Box> (glade,
                                                        "inspectorwidgetbox") ;
-#ifndef WITH_VARIABLE_WALKER
-        var_inspector.reset (new VarInspector (debugger)) ;
-#else
         var_inspector.reset (new VarInspector2 (debugger)) ;
-#endif
         THROW_IF_FAIL (var_inspector) ;
         Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow) ;
         scr->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) ;

Modified: trunk/src/persp/dbgperspective/nmv-var-inspector2.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector2.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector2.cc	Sat Jun 28 10:32:55 2008
@@ -24,8 +24,6 @@
  */
 #include "config.h"
 
-#ifdef WITH_VARIABLE_WALKER
-
 #include <glib/gi18n.h>
 #include <gtkmm/treestore.h>
 #include "common/nmv-exception.h"
@@ -287,5 +285,3 @@
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VARIABLE_WALKER
-

Modified: trunk/src/persp/dbgperspective/nmv-variables-utils2.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-variables-utils2.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-variables-utils2.cc	Sat Jun 28 10:32:55 2008
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#ifdef WITH_VARIABLE_WALKER
-
 #include "nmv-variables-utils2.h"
 #include "common/nmv-exception.h"
 #include "nmv-ui-utils.h"
@@ -271,5 +269,3 @@
 NEMIVER_END_NAMESPACE (variables_utils2)
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VARIABLE_WALKER
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]