[Scummvm-cvs-logs] SF.net SVN: scummvm: [21597] scummvm/trunk/backends/fs/ps2
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Apr 4 13:56:03 CEST 2006
Revision: 21597
Author: fingolfin
Date: 2006-04-04 13:54:55 -0700 (Tue, 04 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21597&view=rev
Log Message:
-----------
Removing more pseudo copy constructors in favor of the standard copy constructor (gee, everybody is copying my bad code, it seems ;-)
Modified Paths:
--------------
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/morphos/abox-fs.cpp
scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
scummvm/trunk/backends/fs/ps2/ps2-fs.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/windows/windows-fs.cpp
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -55,7 +55,6 @@
public:
AmigaOSFilesystemNode();
- AmigaOSFilesystemNode(const AmigaOSFilesystemNode *pNode);
AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName = 0);
AmigaOSFilesystemNode(const String &p);
@@ -69,7 +68,6 @@
virtual FSList listDir(ListMode mode = kListDirectoriesOnly) const;
virtual FSList listVolumes(void) const;
virtual AbstractFilesystemNode *parent() const;
- virtual AbstractFilesystemNode *clone() const { return new AmigaOSFilesystemNode(this); };
};
AbstractFilesystemNode *FilesystemNode::getRoot() {
@@ -308,7 +306,7 @@
if (_pFileLock == 0) {
//debug(6, "Root node\n");
LEAVE();
- return clone();
+ return return new AmigaOSFilesystemNode(*this);
}
BPTR parentDir = IDOS->ParentDir( _pFileLock );
Modified: scummvm/trunk/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -43,7 +43,6 @@
public:
ABoxFilesystemNode();
ABoxFilesystemNode(BPTR lock, CONST_STRPTR display_name = NULL);
- ABoxFilesystemNode(const ABoxFilesystemNode *node);
~ABoxFilesystemNode();
virtual String displayName() const { return _displayName; }
@@ -54,7 +53,6 @@
virtual FSList listDir(ListMode mode = kListDirectoriesOnly) const;
static FSList listRoot();
virtual AbstractFilesystemNode *parent() const;
- virtual AbstractFilesystemNode *clone() const { return new ABoxFilesystemNode(this); }
};
@@ -120,15 +118,6 @@
FreeDosObject(DOS_FIB, fib);
}
-ABoxFilesystemNode::ABoxFilesystemNode(const ABoxFilesystemNode *node)
-{
- _displayName = node->_displayName;
- _isValid = node->_isValid;
- _isDirectory = node->_isDirectory;
- _path = node->_path;
- _lock = DupLock(node->_lock);
-}
-
ABoxFilesystemNode::~ABoxFilesystemNode()
{
if (_lock)
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -41,7 +41,6 @@
public:
PalmOSFilesystemNode();
PalmOSFilesystemNode(const Char *path);
- PalmOSFilesystemNode(const PalmOSFilesystemNode *node);
virtual String displayName() const { return _displayName; }
virtual bool isValid() const { return _isValid; }
@@ -55,6 +54,17 @@
static void addFile (FSList &list, ListMode mode, const Char *base, FileInfoType* find_data);
};
+static const char *lastPathComponent(const Common::String &str) {
+ const char *start = str.c_str();
+ const char *cur = start + str.size() - 2;
+
+ while (cur > start && *cur != '/') {
+ --cur;
+ }
+
+ return cur+1;
+}
+
void PalmOSFilesystemNode::addFile(FSList &list, ListMode mode, const char *base, FileInfoType* find_data) {
PalmOSFilesystemNode entry;
bool isDirectory;
@@ -74,7 +84,7 @@
entry._isValid = true;
entry._isPseudoRoot = false;
- list.push_back(wrap(new PalmOSFilesystemNode(&entry)));
+ list.push_back(wrap(new PalmOSFilesystemNode(entry)));
}
AbstractFilesystemNode *FilesystemNode::getRoot() {
@@ -89,14 +99,6 @@
_isPseudoRoot = true;
}
-PalmOSFilesystemNode::PalmOSFilesystemNode(const PalmOSFilesystemNode *node) {
- _displayName = node->_displayName;
- _isDirectory = node->_isDirectory;
- _isValid = node->_isValid;
- _isPseudoRoot = node->_isPseudoRoot;
- _path = node->_path;
-}
-
FSList PalmOSFilesystemNode::listDir(ListMode mode) const {
FSList myList;
@@ -125,17 +127,6 @@
return myList;
}
-const char *lastPathComponent(const Common::String &str) {
- const char *start = str.c_str();
- const char *cur = start + str.size() - 2;
-
- while (cur > start && *cur != '/') {
- --cur;
- }
-
- return cur+1;
-}
-
AbstractFilesystemNode *PalmOSFilesystemNode::parent() const {
PalmOSFilesystemNode *p = 0;
Modified: scummvm/trunk/backends/fs/ps2/ps2-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ps2/ps2-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/ps2/ps2-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -36,7 +36,6 @@
public:
Ps2FilesystemNode(void);
- Ps2FilesystemNode(const Ps2FilesystemNode *node);
Ps2FilesystemNode(const String &path);
virtual String displayName() const { return _displayName; }
@@ -76,13 +75,6 @@
_isDirectory = true;
}
-Ps2FilesystemNode::Ps2FilesystemNode(const Ps2FilesystemNode *node) {
- _displayName = node->_displayName;
- _isDirectory = node->_isDirectory;
- _path = node->_path;
- _isRoot = node->_isRoot;
-}
-
FSList Ps2FilesystemNode::listDir(ListMode mode) const {
assert(_isDirectory);
@@ -116,7 +108,7 @@
dirEntry._path += tocEntries[fCnt].filename;
dirEntry._displayName = tocEntries[fCnt].filename;
- myList.push_back(wrap(new Ps2FilesystemNode(&dirEntry)));
+ myList.push_back(wrap(new Ps2FilesystemNode(dirEntry)));
}
}
return myList;
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -45,7 +45,6 @@
public:
SymbianFilesystemNode(bool aIsRoot);
SymbianFilesystemNode(const String &path);
- SymbianFilesystemNode(const SymbianFilesystemNode *node);
virtual String displayName() const { return _displayName; }
virtual bool isValid() const { return _isValid; }
virtual bool isDirectory() const { return _isDirectory; }
@@ -97,14 +96,6 @@
_isDirectory = true;
}
-SymbianFilesystemNode::SymbianFilesystemNode(const SymbianFilesystemNode *node) {
- _displayName = node->_displayName;
- _isValid = node->_isValid;
- _isDirectory = node->_isDirectory;
- _path = node->_path;
- _isPseudoRoot = node->_isPseudoRoot;
-}
-
FSList SymbianFilesystemNode::listDir(ListMode mode) const {
assert(_isDirectory);
FSList myList;
@@ -144,7 +135,7 @@
entry._isValid = true;
entry._isPseudoRoot = false;
entry._path = path;
- myList.push_back(wrap(new SymbianFilesystemNode(&entry)));
+ myList.push_back(wrap(new SymbianFilesystemNode(entry)));
}
} else {
TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
@@ -173,7 +164,7 @@
if (entry._isDirectory)
entry._path += "\\";
- myList.push_back(wrap(new SymbianFilesystemNode(&entry)));
+ myList.push_back(wrap(new SymbianFilesystemNode(entry)));
}
CleanupStack::PopAndDestroy(dirPtr);
}
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp 2006-04-04 20:49:26 UTC (rev 21596)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp 2006-04-04 20:54:55 UTC (rev 21597)
@@ -43,7 +43,6 @@
public:
WindowsFilesystemNode();
WindowsFilesystemNode(const String &path);
- WindowsFilesystemNode(const WindowsFilesystemNode *node);
virtual String displayName() const { return _displayName; }
virtual bool isValid() const { return _isValid; }
@@ -60,6 +59,17 @@
};
+static const char *lastPathComponent(const Common::String &str) {
+ const char *start = str.c_str();
+ const char *cur = start + str.size() - 2;
+
+ while (cur > start && *cur != '\\') {
+ --cur;
+ }
+
+ return cur + 1;
+}
+
char* WindowsFilesystemNode::toAscii(TCHAR *x) {
#ifndef UNICODE
@@ -105,7 +115,7 @@
entry._isValid = true;
entry._isPseudoRoot = false;
- list.push_back(wrap(new WindowsFilesystemNode(&entry)));
+ list.push_back(wrap(new WindowsFilesystemNode(entry)));
}
AbstractFilesystemNode *FilesystemNode::getRoot() {
@@ -161,14 +171,6 @@
}
}
-WindowsFilesystemNode::WindowsFilesystemNode(const WindowsFilesystemNode *node) {
- _displayName = node->_displayName;
- _isDirectory = node->_isDirectory;
- _isValid = node->_isValid;
- _isPseudoRoot = node->_isPseudoRoot;
- _path = node->_path;
-}
-
FSList WindowsFilesystemNode::listDir(ListMode mode) const {
assert(_isDirectory);
@@ -192,7 +194,7 @@
entry._isValid = true;
entry._isPseudoRoot = false;
entry._path = toAscii(current_drive);
- myList.push_back(wrap(new WindowsFilesystemNode(&entry)));
+ myList.push_back(wrap(new WindowsFilesystemNode(entry)));
}
#endif
}
@@ -217,17 +219,6 @@
return myList;
}
-const char *lastPathComponent(const Common::String &str) {
- const char *start = str.c_str();
- const char *cur = start + str.size() - 2;
-
- while (cur > start && *cur != '\\') {
- --cur;
- }
-
- return cur + 1;
-}
-
AbstractFilesystemNode *WindowsFilesystemNode::parent() const {
assert(_isValid || _isPseudoRoot);
if (_isPseudoRoot)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list