fix "make dist" target

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index c6171fd541c801bbf7fc1d2b52ebc169b7b19701..3ea3b88de1f75517984b248776bb007c3e13edc7 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -12,6 +12,8 @@
 
 #include <config.h>
 
+#include <iostream>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -26,8 +28,8 @@
 #include "BufferView.h"
 
 
-using std::endl;
 using SigC::slot;
+using std::vector;
 
 extern LyXAction lyxaction;
 
@@ -121,7 +123,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 +146,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 +159,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 +174,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 +189,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: