Remove unused font variable which caused a warning.

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index c6171fd541c801bbf7fc1d2b52ebc169b7b19701..a347acec8e23893e275cfded86bd2d4c6a34c7dc 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -5,13 +5,15 @@
  *                 information.
  * 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.  
+ *           Copyright 1995-2001 The LyX Team.  
  * 
  * ###########################################################################
  */
 
 #include <config.h>
 
+#include <iostream>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -21,13 +23,14 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "LyXView.h"
+#include "XFormsView.h"
 #include "gettext.h"
 #include "LyXAction.h"
 #include "BufferView.h"
 
 
-using std::endl;
 using SigC::slot;
+using std::vector;
 
 extern LyXAction lyxaction;
 
@@ -100,7 +103,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                stored_set(input);
                                fl_set_input(ob, _("[End of history]"));
                        } else {
-                               fl_set_input(ob, (*hist_iter).c_str());
+                               fl_set_input(ob, hist_iter->c_str());
                        }
                        return 1; 
                case XK_Up:
@@ -110,7 +113,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                fl_set_input(ob, _("[Beginning of history]"));
                        } else {
                                --hist_iter;
-                               fl_set_input(ob, (*hist_iter).c_str());
+                               fl_set_input(ob, hist_iter->c_str());
                        }
                        return 1; 
                case 9:
@@ -121,7 +124,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                        vector<string> comp;
                        lyx::copy_if(completion_.begin(),
                                     completion_.end(),
-                                    back_inserter(comp), prefix(input));
+                                    std::back_inserter(comp), prefix(input));
 
                        if (comp.empty()) {
                                // No matches
@@ -144,7 +147,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                        vector<string> vtmp;
                                        lyx::copy_if(comp.begin(),
                                                     comp.end(),
-                                                    back_inserter(vtmp),
+                                                    std::back_inserter(vtmp),
                                                     prefix(test));
                                        if (vtmp.size() != comp.size()) {
                                                test.erase(test.length() - 1);
@@ -157,7 +160,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                // How should the possible matches
                                // be visualized?
                                std::copy(comp.begin(), comp.end(),
-                                         ostream_iterator<string>(cerr, "\n"));
+                                         std::ostream_iterator<string>(std::cerr, "\n"));
                        }
                        return 1; 
                }
@@ -172,6 +175,10 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                case 13:
                case XK_Return:
                {
+#if 0
+                       // This will go in again in a little while
+                       // we need to be able to declare what types
+                       // of argumetns LFUN's should have first. (Lgb)
                        // First check for match
                        vector<string>::const_iterator cit =
                                std::find(completion_.begin(),
@@ -183,12 +190,15 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                string const tmp = input + _(" [no match]");
                                fl_set_input(ob, tmp.c_str());
                        } else {
+#endif
                                // Return the inputted string
                                deactivate();
                                owner_->view()->focus(true);
                                history_->push_back(input);
                                stringReady.emit(input);
+# if 0
                        }
+#endif
                        return 1;
                }
                case XK_space:
@@ -237,7 +247,8 @@ void MiniBuffer::prepare()
        text.erase();
        fl_set_input(the_buffer, "");
        activate();
-       fl_set_focus_object(owner_->getForm(), the_buffer);
+       fl_set_focus_object(static_cast<XFormsView *>(owner_)->getForm(),
+                           the_buffer);
 }