aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/fs/chroot/chroot-fs-factory.cpp24
-rw-r--r--backends/fs/chroot/chroot-fs-factory.h10
-rw-r--r--backends/fs/chroot/chroot-fs.cpp58
-rw-r--r--backends/fs/chroot/chroot-fs.h40
-rw-r--r--backends/platform/iphone/iphone_main.mm4
-rw-r--r--backends/platform/iphone/osys_main.cpp2
-rw-r--r--devtools/create_project/xcode.cpp2
7 files changed, 70 insertions, 70 deletions
diff --git a/backends/fs/chroot/chroot-fs-factory.cpp b/backends/fs/chroot/chroot-fs-factory.cpp
index 4030f4f502..fa98ab75d3 100644
--- a/backends/fs/chroot/chroot-fs-factory.cpp
+++ b/backends/fs/chroot/chroot-fs-factory.cpp
@@ -32,29 +32,29 @@
#include "backends/fs/posix/posix-fs-factory.h"
ChRootFilesystemFactory::ChRootFilesystemFactory(Common::String root) {
- _root = root;
+ _root = root;
}
AbstractFSNode *ChRootFilesystemFactory::makeRootFileNode() const {
- return new ChRootFilesystemNode(_root, "/");
+ return new ChRootFilesystemNode(_root, "/");
}
AbstractFSNode *ChRootFilesystemFactory::makeCurrentDirectoryFileNode() const {
- char buf[MAXPATHLEN];
- if (getcwd(buf, MAXPATHLEN) == NULL) {
- return NULL;
- }
+ char buf[MAXPATHLEN];
+ if (getcwd(buf, MAXPATHLEN) == NULL) {
+ return NULL;
+ }
- if (Common::String(buf).hasPrefix(_root + Common::String("/"))) {
- return new ChRootFilesystemNode(_root, buf + _root.size());
- }
+ if (Common::String(buf).hasPrefix(_root + Common::String("/"))) {
+ return new ChRootFilesystemNode(_root, buf + _root.size());
+ }
- return new ChRootFilesystemNode(_root, "/");
+ return new ChRootFilesystemNode(_root, "/");
}
AbstractFSNode *ChRootFilesystemFactory::makeFileNodePath(const Common::String &path) const {
- assert(!path.empty());
- return new ChRootFilesystemNode(_root, path);
+ assert(!path.empty());
+ return new ChRootFilesystemNode(_root, path);
}
#endif
diff --git a/backends/fs/chroot/chroot-fs-factory.h b/backends/fs/chroot/chroot-fs-factory.h
index 2c05107b0f..c7bd9a74a7 100644
--- a/backends/fs/chroot/chroot-fs-factory.h
+++ b/backends/fs/chroot/chroot-fs-factory.h
@@ -27,15 +27,15 @@
class ChRootFilesystemFactory : public FilesystemFactory {
private:
- Common::String _root;
+ Common::String _root;
protected:
- virtual AbstractFSNode *makeRootFileNode() const;
- virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
- virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
+ virtual AbstractFSNode *makeRootFileNode() const;
+ virtual AbstractFSNode *makeCurrentDirectoryFileNode() const;
+ virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
public:
- ChRootFilesystemFactory(Common::String root);
+ ChRootFilesystemFactory(Common::String root);
};
#endif /* CHROOT_FS_FACTORY_H */
diff --git a/backends/fs/chroot/chroot-fs.cpp b/backends/fs/chroot/chroot-fs.cpp
index 1a2bc4c087..7cdd800dac 100644
--- a/backends/fs/chroot/chroot-fs.cpp
+++ b/backends/fs/chroot/chroot-fs.cpp
@@ -33,79 +33,79 @@
#include "backends/fs/chroot/chroot-fs.h"
ChRootFilesystemNode::ChRootFilesystemNode(const Common::String &root, POSIXFilesystemNode *node) {
- _root = Common::normalizePath(root, '/');
- _realNode = node;
+ _root = Common::normalizePath(root, '/');
+ _realNode = node;
}
ChRootFilesystemNode::ChRootFilesystemNode(const Common::String &root, const Common::String &path) {
- _root = Common::normalizePath(root, '/');
- _realNode = new POSIXFilesystemNode(root.stringByAppendingPathComponent(path));
+ _root = Common::normalizePath(root, '/');
+ _realNode = new POSIXFilesystemNode(root.stringByAppendingPathComponent(path));
}
ChRootFilesystemNode::~ChRootFilesystemNode() {
- delete _realNode;
+ delete _realNode;
}
bool ChRootFilesystemNode::exists() const {
- return _realNode->exists();
+ return _realNode->exists();
}
Common::String ChRootFilesystemNode::getDisplayName() const {
- return getName();
+ return getName();
}
Common::String ChRootFilesystemNode::getName() const {
- return _realNode->AbstractFSNode::getDisplayName();
+ return _realNode->AbstractFSNode::getDisplayName();
}
Common::String ChRootFilesystemNode::getPath() const {
- Common::String path = _realNode->getPath();
- if (path.size() > _root.size()) {
- return Common::String(path.c_str() + _root.size());
- }
- return Common::String("/");
+ Common::String path = _realNode->getPath();
+ if (path.size() > _root.size()) {
+ return Common::String(path.c_str() + _root.size());
+ }
+ return Common::String("/");
}
bool ChRootFilesystemNode::isDirectory() const {
- return _realNode->isDirectory();
+ return _realNode->isDirectory();
}
bool ChRootFilesystemNode::isReadable() const {
- return _realNode->isReadable();
+ return _realNode->isReadable();
}
bool ChRootFilesystemNode::isWritable() const {
- return _realNode->isWritable();
+ return _realNode->isWritable();
}
AbstractFSNode *ChRootFilesystemNode::getChild(const Common::String &n) const {
- return new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) _realNode->getChild(n));
+ return new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) _realNode->getChild(n));
}
bool ChRootFilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool hidden) const {
- AbstractFSList tmp;
- if (!_realNode->getChildren(tmp, mode, hidden)) {
- return false;
- }
+ AbstractFSList tmp;
+ if (!_realNode->getChildren(tmp, mode, hidden)) {
+ return false;
+ }
- for (AbstractFSList::iterator i=tmp.begin(); i!=tmp.end(); ++i) {
- list.push_back(new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) *i));
- }
+ for (AbstractFSList::iterator i=tmp.begin(); i!=tmp.end(); ++i) {
+ list.push_back(new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) *i));
+ }
- return true;
+ return true;
}
AbstractFSNode *ChRootFilesystemNode::getParent() const {
- if (getPath() == "/") return 0;
- return new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) _realNode->getParent());
+ if (getPath() == "/") return 0;
+ return new ChRootFilesystemNode(_root, (POSIXFilesystemNode *) _realNode->getParent());
}
Common::SeekableReadStream *ChRootFilesystemNode::createReadStream() {
- return _realNode->createReadStream();
+ return _realNode->createReadStream();
}
Common::WriteStream *ChRootFilesystemNode::createWriteStream() {
- return _realNode->createWriteStream();
+ return _realNode->createWriteStream();
}
#endif
diff --git a/backends/fs/chroot/chroot-fs.h b/backends/fs/chroot/chroot-fs.h
index 7dd62cb9a8..2d4c3eb9dd 100644
--- a/backends/fs/chroot/chroot-fs.h
+++ b/backends/fs/chroot/chroot-fs.h
@@ -26,29 +26,29 @@
#include "backends/fs/posix/posix-fs.h"
class ChRootFilesystemNode : public AbstractFSNode {
- Common::String _root;
- POSIXFilesystemNode *_realNode;
+ Common::String _root;
+ POSIXFilesystemNode *_realNode;
- ChRootFilesystemNode(const Common::String &root, POSIXFilesystemNode *);
+ ChRootFilesystemNode(const Common::String &root, POSIXFilesystemNode *);
public:
- ChRootFilesystemNode(const Common::String &root, const Common::String &path);
- virtual ~ChRootFilesystemNode();
-
- virtual bool exists() const;
- virtual Common::String getDisplayName() const;
- virtual Common::String getName() const;
- virtual Common::String getPath() const;
- virtual bool isDirectory() const;
- virtual bool isReadable() const;
- virtual bool isWritable() const;
-
- virtual AbstractFSNode *getChild(const Common::String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
- virtual AbstractFSNode *getParent() const;
-
- virtual Common::SeekableReadStream *createReadStream();
- virtual Common::WriteStream *createWriteStream();
+ ChRootFilesystemNode(const Common::String &root, const Common::String &path);
+ virtual ~ChRootFilesystemNode();
+
+ virtual bool exists() const;
+ virtual Common::String getDisplayName() const;
+ virtual Common::String getName() const;
+ virtual Common::String getPath() const;
+ virtual bool isDirectory() const;
+ virtual bool isReadable() const;
+ virtual bool isWritable() const;
+
+ virtual AbstractFSNode *getChild(const Common::String &n) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
+ virtual AbstractFSNode *getParent() const;
+
+ virtual Common::SeekableReadStream *createReadStream();
+ virtual Common::WriteStream *createWriteStream();
};
#endif /* CHROOT_FS_H */
diff --git a/backends/platform/iphone/iphone_main.mm b/backends/platform/iphone/iphone_main.mm
index e8ea060679..d32196090c 100644
--- a/backends/platform/iphone/iphone_main.mm
+++ b/backends/platform/iphone/iphone_main.mm
@@ -104,13 +104,13 @@ int main(int argc, char **argv) {
_window = [[UIWindow alloc] initWithFrame:rect];
[_window retain];
- _controller = [[ScummVMViewController alloc] init];
+ _controller = [[ScummVMViewController alloc] init];
_view = [[iPhoneView alloc] initWithFrame:rect];
_view.multipleTouchEnabled = YES;
_controller.view = _view;
- [_window setRootViewController:_controller];
+ [_window setRootViewController:_controller];
[_window makeKeyAndVisible];
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 9d0a7f4411..c1b55c297e 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -90,7 +90,7 @@ OSystem_IPHONE::~OSystem_IPHONE() {
}
bool OSystem_IPHONE::touchpadModeEnabled() const {
- return _touchpadModeEnabled;
+ return _touchpadModeEnabled;
}
int OSystem_IPHONE::timerHandler(int t) {
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 8e2ab4c04d..46e6bcd41b 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -755,7 +755,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(iPhone_Debug, "GCC_ENABLE_FIX_AND_CONTINUE", "NO");
ADD_SETTING(iPhone_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
ADD_SETTING(iPhone_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
- ADD_SETTING(iPhone_Debug, "GCC_WARN_64_TO_32_BIT_CONVERSION", "NO");
+ ADD_SETTING(iPhone_Debug, "GCC_WARN_64_TO_32_BIT_CONVERSION", "NO");
ADD_SETTING_QUOTE(iPhone_Debug, "GCC_PREFIX_HEADER", "");
ADD_SETTING(iPhone_Debug, "GCC_THUMB_SUPPORT", "NO");
ADD_SETTING(iPhone_Debug, "GCC_UNROLL_LOOPS", "YES");
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 20:10:23 +0000