small changes to ButtonController usage

[lyx.git] / src / filedlg.C

diff --git a/src/filedlg.C b/src/filedlg.C
index 388318e3c34925d166d5766fb2adbdb9f4f6d736..1413a9fffaabee899f14994f64aef726604f96c8 100644 (file)
--- a/src/filedlg.C
+++ b/src/filedlg.C
@@ -5,14 +5,13 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
 #include <unistd.h>
-#include <cstdio>
 #include <cstdlib>
 #include <pwd.h>
 #include <grp.h>
@@ -89,26 +88,29 @@ public:
        }
 private:
        ///
-       void add(uid_t ID) const {
-               string pszNewName;
-               struct passwd * pEntry;
-               
-               // gets user name
-               if ((pEntry = getpwuid(ID)))
-                       pszNewName = pEntry->pw_name;
-               else {
-                       pszNewName = tostr(ID);
-               }
-               
-               // adds new node
-               users[ID] = pszNewName;
-       }
+       void add(uid_t ID) const;
        ///
        typedef map<uid_t, string> Users;
        ///
        mutable Users users;
 };
 
+void UserCache::add(uid_t ID) const 
+{
+       string pszNewName;
+       struct passwd * pEntry;
+       
+       // gets user name
+       if ((pEntry = getpwuid(ID)))
+               pszNewName = pEntry->pw_name;
+       else {
+               pszNewName = tostr(ID);
+       }
+       
+       // adds new node
+       users[ID] = pszNewName;
+}      
+
 
 /// Group cache class definition
 class GroupCache {
@@ -124,24 +126,27 @@ public:
        }
 private:
        ///
-       void add(gid_t ID) const {
-               string pszNewName;
-               struct group * pEntry;
-               
-               // gets user name
-               if ((pEntry = getgrgid(ID))) pszNewName = pEntry->gr_name;
-               else {
-                       pszNewName = tostr(ID);
-               }
-               // adds new node
-               groups[ID] = pszNewName;
-       }
+       void add(gid_t ID) const;
        ///
        typedef map<gid_t, string> Groups;
        ///
        mutable Groups groups;
 };
 
+void GroupCache::add(gid_t ID) const 
+{
+       string pszNewName;
+       struct group * pEntry;
+       
+       // gets user name
+       if ((pEntry = getgrgid(ID))) pszNewName = pEntry->gr_name;
+       else {
+               pszNewName = tostr(ID);
+       }
+       // adds new node
+       groups[ID] = pszNewName;
+}
+       
 // static instances
 static UserCache lyxUserCache;
 static GroupCache lyxGroupCache;
@@ -416,7 +421,7 @@ void LyXFileDlg::SetButton(int iIndex, string const & pszName,
                *pTemp = pszPath;
        } else {
                fl_hide_object(pObject);
-               (*pTemp).clear();
+               (*pTemp).erase();
        }
 }
 
@@ -508,6 +513,7 @@ void LyXFileDlg::FileDlgCB(FL_OBJECT *, long lArgument)
        }
 }
 
+
 extern "C" void C_LyXFileDlg_FileDlgCB(FL_OBJECT * ob, long data) 
 {
        LyXFileDlg::FileDlgCB(ob, data);
@@ -574,7 +580,7 @@ bool LyXFileDlg::HandleDoubleClick()
                        Temp += pszTemp;
                } else {
                        // Directory higher up
-                       Temp.clear();
+                       Temp.erase();
                        for (int i = 0; i < iSelect; ++i) {
                                string piece = fl_get_browser_line(pFileDlgForm->List, i+1);
                                // The '+2' is here to count the '@b' (JMarc)