diff options
| author | Adrian Frühwirth | 2018-05-07 09:39:00 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-07 20:06:29 +0200 |
| commit | 8885b37abb842af63e0836263b0db245530fef03 (patch) | |
| tree | 9e91036bf7f98aaff4cece8c46c3c9910642030e /engines/titanic | |
| parent | 9ea943a81e73a18cce8ced74cf20303d0766a22d (diff) | |
| download | scummvm-rg350-8885b37abb842af63e0836263b0db245530fef03.tar.gz scummvm-rg350-8885b37abb842af63e0836263b0db245530fef03.tar.bz2 scummvm-rg350-8885b37abb842af63e0836263b0db245530fef03.zip | |
TITANIC: Enforce code formatting guidelines
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/core/list.h | 4 | ||||
| -rw-r--r-- | engines/titanic/core/project_item.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/support/simple_file.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/simple_file.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index 09068fb06a..6da3a9224a 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -106,7 +106,7 @@ public: for (uint idx = 0; idx < count; ++idx) { // Validate the class start header - if (!file->IsClassStart()) + if (!file->isClassStart()) error("Unexpected class end"); // Get item's class name and use it to instantiate an item @@ -120,7 +120,7 @@ public: Common::List<T *>::push_back(newItem); // Validate the class end footer - if (file->IsClassStart()) + if (file->isClassStart()) error("Unexpected class start"); } } diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp index 17b506a291..99eec803ac 100644 --- a/engines/titanic/core/project_item.cpp +++ b/engines/titanic/core/project_item.cpp @@ -195,7 +195,7 @@ void CProjectItem::loadGame(int slotId) { // Load the contents in CProjectItem *newProject = loadData(&file); - file.IsClassStart(); + file.isClassStart(); getGameManager()->load(&file); file.close(); @@ -250,7 +250,7 @@ void CProjectItem::clear() { } CProjectItem *CProjectItem::loadData(SimpleFile *file) { - if (!file->IsClassStart()) + if (!file->isClassStart()) return nullptr; CProjectItem *root = nullptr; @@ -291,8 +291,8 @@ CProjectItem *CProjectItem::loadData(SimpleFile *file) { item->load(file); } - file->IsClassStart(); - } while (file->IsClassStart()); + file->isClassStart(); + } while (file->isClassStart()); return root; } diff --git a/engines/titanic/support/simple_file.cpp b/engines/titanic/support/simple_file.cpp index 103f062ac6..83d731f7f2 100644 --- a/engines/titanic/support/simple_file.cpp +++ b/engines/titanic/support/simple_file.cpp @@ -388,7 +388,7 @@ void SimpleFile::writeIndent(uint indent) const { write("\t", 1); } -bool SimpleFile::IsClassStart() { +bool SimpleFile::isClassStart() { char c; do { diff --git a/engines/titanic/support/simple_file.h b/engines/titanic/support/simple_file.h index 01aaa86925..f71ef5b717 100644 --- a/engines/titanic/support/simple_file.h +++ b/engines/titanic/support/simple_file.h @@ -238,7 +238,7 @@ public: * an opening or closing squiggly bracket denoting a class * definition start or end. Returns true if it's a class start */ - bool IsClassStart(); + bool isClassStart(); /** * Write the starting header for a class definition |