X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffiledlg.h;h=a6dbfb154f13a85a1f96dda1a761a653f4ab5588;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=a8a75ebd17c86ec596c10748aa19c376d57119b2;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/filedlg.h b/src/filedlg.h
index a8a75ebd17..a6dbfb154f 100644
--- a/src/filedlg.h
+++ b/src/filedlg.h
@@ -1,16 +1,16 @@
 // -*- C++ -*-
 /* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-*        
-*           Copyright (C) 1995 1996 Matthias Ettrich
-*           and the LyX Team.
-*
-*======================================================*/
-
-#ifndef __FILEDLG_H__
-#define __FILEDLG_H__
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-1999 The LyX Team.
+ *
+ * ======================================================*/
+
+#ifndef FILEDLG_H
+#define FILEDLG_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -28,18 +28,18 @@ class UserCache
 {
 public:
 	///
-	UserCache(LString const & pszName = LString(), uid_t ID = 0, 
-		  UserCache *pRoot = NULL);
+	UserCache(string const & pszName = string(), uid_t ID = 0, 
+		  UserCache *pRoot = 0);
 	///
 	~UserCache();
 	// interface
 	/// seeks user name from user ID
-	LString Find(uid_t ID);
+	string Find(uid_t ID);
 private:
 	///
 	uid_t ID;
 	///
-	LString pszName;
+	string pszName;
 	///
 	UserCache *pNext, *pRoot;
 	// internal methods
@@ -54,19 +54,19 @@ class GroupCache
 {
 public:
 	///
-	GroupCache(LString const & pszName = LString(), gid_t ID = 0,
-		   GroupCache *pRoot = NULL);
+	GroupCache(string const & pszName = string(), gid_t ID = 0,
+		   GroupCache *pRoot = 0);
 	///
 	~GroupCache();
 	// interface
 	/// seeks group name from group ID
-	LString Find(gid_t ID);
+	string Find(gid_t ID);
 
 private:
 	///
 	gid_t ID;
 	///
-	LString pszName;
+	string pszName;
 	///
 	GroupCache *pNext, *pRoot;
 	// internal methods
@@ -81,12 +81,13 @@ class LyXDirEntry
 {
 private:
 	friend class LyXFileDlg;    
-	LString pszName;
-	LString pszDisplayed;
-	LString pszLsEntry;
+	string pszName;
+	string pszDisplayed;
+	string pszLsEntry;
+	LyXDirEntry() {};
+public:
 	/// compares two LyXDirEntry objects content (used by qsort)
 	static int ldeCompProc(const LyXDirEntry *r1, const LyXDirEntry *r2);
-	LyXDirEntry() {};
 };
 
 
@@ -99,32 +100,34 @@ public:
 	///
 	~LyXFileDlg();
 	/// sets file selector user button action
-	void SetButton(int iIndex, LString const & pszName = LString(), 
-		       LString const & pszPath = LString());
+	void SetButton(int iIndex, string const & pszName = string(), 
+		       string const & pszPath = string());
 	/// gets last dialog directory
-	LString GetDirectory();
+	string GetDirectory();
 	/// launches dialog and returns selected file
-	LString Select(LString const & pszTitle = LString(),
-		       LString const & pszPath = LString(),
-		       LString const & pszMask = LString(), 
-		       LString const & pszSuggested = LString());
+	string Select(string const & pszTitle = string(),
+		       string const & pszPath = string(),
+		       string const & pszMask = string(), 
+		       string const & pszSuggested = string());
 	/// XForms objects callback (static)
 	static void FileDlgCB(FL_OBJECT *, long);
 	/// Callback for double click in list
 	static void DoubleClickCB(FL_OBJECT *, long);
+	/// Handle Cancel CB from WM close
+	static int CancelCB(FL_FORM *, void *);
 private:
 	// data
 	static FD_FileDlg *pFileDlgForm;
 	static LyXFileDlg *pCurrentDlg;
-	LString pszUserPath1;
-	LString pszUserPath2;
-	LString pszDirectory;
-	LString pszMask;
-	LString pszFileName;
+	string pszUserPath1;
+	string pszUserPath2;
+	string pszDirectory;
+	string pszMask;
+	string pszFileName;
 	int iDepth;
 	int iLastSel;
 	long lLastTime;
-	LString pszInfoLine;
+	string pszInfoLine;
 	LyXDirEntry *pCurrentNames;
 	int iNumNames;
 
@@ -135,11 +138,11 @@ private:
 	/// updates dialog list to match class directory
 	void Reread();
 	/// sets dialog current directory
-	void SetDirectory(LString const & pszPath);
+	void SetDirectory(string const & pszPath);
 	/// sets dialog file mask
-	void SetMask(LString const & pszNewMask);
+	void SetMask(string const & pszNewMask);
 	/// sets dialog information line
-	void SetInfoLine(LString const & pszLine);
+	void SetInfoLine(string const & pszLine);
 	/// handle dialog during file selection
 	bool RunDialog();
 	/// Handle callback from list
@@ -148,8 +151,6 @@ private:
 	bool HandleDoubleClick();
 	/// Handle OK button call
 	bool HandleOK();
-	/// Handle Cancel CB from WM close
-	static int CancelCB(FL_FORM *, void *);
 	/// Simulates a click on OK/Cancel
 	void Force(bool);
 };