Extends IBusObject.

chromeos/dbus/ibus/ibus_object.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/ibus/ibus_object.h"
 
 #include "base/logging.h"
+#include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/message.h"
 
 namespace chromeos {
+// TODO(nona): Remove ibus namespace after complete libibus removal.
+namespace ibus {
 
 ///////////////////////////////////////////////////////////////////////////////
 // IBusObjectReader
 IBusObjectReader::IBusObjectReader(const std::string& type_name,
                                    dbus::MessageReader* reader)
     : type_name_(type_name),
       original_reader_(reader),
       top_variant_reader_(NULL),
       contents_reader_(NULL),
       check_result_(IBUS_OBJECT_NOT_CHECKED) {
@@ skipping 64 matching lines @@
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopString(out);
 }
 
 bool IBusObjectReader::PopUint32(uint32* out) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopUint32(out);
 }
 
+bool IBusObjectReader::PopInt32(int32* out) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && contents_reader_->PopInt32(out);
+}
+
+bool IBusObjectReader::PopBool(bool* out) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && contents_reader_->PopBool(out);
+}
+
 bool IBusObjectReader::PopArray(dbus::MessageReader* reader) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopArray(reader);
 }
 
+bool IBusObjectReader::PopIBusText(IBusText* text) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && chromeos::ibus::PopIBusText(contents_reader_.get(), text);
+}
+
+bool IBusObjectReader::PopStringFromIBusText(std::string* text) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && chromeos::ibus::PopStringFromIBusText(
+      contents_reader_.get(), text);
+}
+
 bool IBusObjectReader::HasMoreData() {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->HasMoreData();
 }
 
 bool IBusObjectReader::PopIBusObject(IBusObjectReader* reader) {
   DCHECK(contents_reader_.get());
   if (!IsValid())
     return false;
@@ skipping 23 matching lines @@
 void IBusObjectWriter::AppendString(const std::string& input) {
   DCHECK(IsInitialized());
   contents_writer_->AppendString(input);
 }
 
 void IBusObjectWriter::AppendUint32(uint32 input) {
   DCHECK(IsInitialized());
   contents_writer_->AppendUint32(input);
 }
 
+void IBusObjectWriter::AppendInt32(int32 input) {
+  DCHECK(IsInitialized());
+  contents_writer_->AppendInt32(input);
+}
+
+void IBusObjectWriter::AppendBool(bool input) {
+  DCHECK(IsInitialized());
+  contents_writer_->AppendBool(input);
+}
+
 void IBusObjectWriter::OpenArray(const std::string& signature,
                                  dbus::MessageWriter* writer) {
   DCHECK(IsInitialized());
   contents_writer_->OpenArray(signature, writer);
 }
 
+void IBusObjectWriter::AppendIBusText(const IBusText& text) {
+  DCHECK(IsInitialized());
+  chromeos::ibus::AppendIBusText(text, contents_writer_.get());
+}
+
+void IBusObjectWriter::AppendStringAsIBusText(const std::string& text) {
+  DCHECK(IsInitialized());
+  chromeos::ibus::AppendStringAsIBusText(text, contents_writer_.get());
+}
+
 void IBusObjectWriter::CloseContainer(dbus::MessageWriter* writer) {
   DCHECK(IsInitialized());
   contents_writer_->CloseContainer(writer);
 }
 
 void IBusObjectWriter::AppendIBusObject(IBusObjectWriter* writer) {
   DCHECK(IsInitialized());
   DCHECK(!writer->IsInitialized()) << "Given writer is already initialized";
 
   writer->InitWithParentWriter(contents_writer_.get());
@@ skipping 31 matching lines @@
   top_variant_writer_->CloseContainer(contents_writer_.get());
   original_writer_->CloseContainer(top_variant_writer_.get());
   top_variant_writer_.reset();
   contents_writer_.reset();
 }
 
 bool IBusObjectWriter::IsInitialized() const {
   return contents_writer_.get() != NULL;
 }
 
+}  // namespace ibus
 }  // namespace chromeos