[Aptitude-svn-commit] r3472 - in branches/aptitude-0.3/aptitude: . src/vscreen
Daniel Burrows
dburrows@costa.debian.org
Sun, 26 Jun 2005 18:17:23 +0000
Author: dburrows
Date: Sun Jun 26 18:17:21 2005
New Revision: 3472
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
Log:
Pass strings into vs_file_pager by reference, not value.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sun Jun 26 18:17:21 2005
@@ -1,5 +1,9 @@
2005-06-26 Daniel Burrows <dburrows@debian.org>
+ * src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
+
+ Use const string &'s in the vs_file_pager interface.
+
* src/vscreen/vs_pager.cc:
Allow wide character strings to be used for the filename of a
Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.cc Sun Jun 26 18:17:21 2005
@@ -284,12 +284,12 @@
{
}
-vs_file_pager::vs_file_pager(string filename):vs_pager("")
+vs_file_pager::vs_file_pager(const string &filename):vs_pager("")
{
load_file(filename);
}
-vs_file_pager::vs_file_pager(wstring filename):vs_pager("")
+vs_file_pager::vs_file_pager(const wstring &filename):vs_pager("")
{
load_file(filename);
}
@@ -299,7 +299,7 @@
{
}
-void vs_file_pager::load_file(string filename)
+void vs_file_pager::load_file(const string &filename)
{
int fd=open(filename.c_str(), O_RDONLY, 0644);
@@ -343,7 +343,7 @@
}
}
-void vs_file_pager::load_file(wstring filename)
+void vs_file_pager::load_file(const wstring &filename)
{
string mbfilename;
Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h Sun Jun 26 18:17:21 2005
@@ -141,23 +141,23 @@
{
public:
vs_file_pager();
- vs_file_pager(std::string filename);
+ vs_file_pager(const std::string &filename);
/** Attempts to convert the string to a multibyte representation and
* then load it; a nonconvertible string is treated as any other
* load failure would be.
*/
- vs_file_pager(std::wstring filename);
+ vs_file_pager(const std::wstring &filename);
vs_file_pager(const char *text, int len);
- void load_file(std::string filename);
+ void load_file(const std::string &filename);
/** Attempts to convert the string to a multibyte representation and
* then load it; a nonconvertible string is treated as any other
* load failure would be.
*/
- void load_file(std::wstring filename);
+ void load_file(const std::wstring &filename);
};
#endif