summaryrefslogtreecommitdiffstats
path: root/gui/object.cpp
diff options
context:
space:
mode:
authorVojtech Bocek <vbocek@gmail.com>2014-02-07 23:58:09 +0100
committerGerrit Code Review <gerrit2@gerrit>2014-02-12 18:30:41 +0100
commitede51c528e5cebc7f1930d5c9da541e7d11c0138 (patch)
tree6ea3d7b2a5881cc0489f0b72ffeacd6d4adf7348 /gui/object.cpp
parentAllow recovery to be restored if backup=1 flag is present in recovery.fstab (diff)
downloadandroid_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar.gz
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar.bz2
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar.lz
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar.xz
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.tar.zst
android_bootable_recovery-ede51c528e5cebc7f1930d5c9da541e7d11c0138.zip
Diffstat (limited to '')
-rw-r--r--gui/object.cpp (renamed from gui/conditional.cpp)18
1 files changed, 11 insertions, 7 deletions
diff --git a/gui/conditional.cpp b/gui/object.cpp
index 5ea8d176c..b6010d778 100644
--- a/gui/conditional.cpp
+++ b/gui/object.cpp
@@ -27,7 +27,7 @@ extern "C" {
#include "objects.hpp"
#include "../data.hpp"
-Conditional::Conditional(xml_node<>* node)
+GUIObject::GUIObject(xml_node<>* node)
{
// Break out early, it's too hard to check if valid every step
if (!node) return;
@@ -61,7 +61,11 @@ Conditional::Conditional(xml_node<>* node)
}
}
-bool Conditional::IsConditionVariable(std::string var)
+GUIObject::~GUIObject()
+{
+}
+
+bool GUIObject::IsConditionVariable(std::string var)
{
std::vector<Condition>::iterator iter;
for (iter = mConditions.begin(); iter != mConditions.end(); iter++)
@@ -72,7 +76,7 @@ bool Conditional::IsConditionVariable(std::string var)
return false;
}
-bool Conditional::isConditionTrue()
+bool GUIObject::isConditionTrue()
{
std::vector<Condition>::iterator iter;
for (iter = mConditions.begin(); iter != mConditions.end(); iter++)
@@ -83,7 +87,7 @@ bool Conditional::isConditionTrue()
return true;
}
-bool Conditional::isConditionTrue(Condition* condition)
+bool GUIObject::isConditionTrue(Condition* condition)
{
// This is used to hold the proper value of "true" based on the '!' NOT flag
bool bTrue = true;
@@ -150,12 +154,12 @@ bool Conditional::isConditionTrue(Condition* condition)
return !bTrue;
}
-bool Conditional::isConditionValid()
+bool GUIObject::isConditionValid()
{
return !mConditions.empty();
}
-void Conditional::NotifyPageSet()
+void GUIObject::NotifyPageSet()
{
std::vector<Condition>::iterator iter;
for (iter = mConditions.begin(); iter != mConditions.end(); iter++)
@@ -175,7 +179,7 @@ void Conditional::NotifyPageSet()
}
}
-bool Conditional::isMounted(string vol)
+bool GUIObject::isMounted(string vol)
{
FILE *fp;
char tmpOutput[255];