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 after complete libibus removal.

[satorux1, 2012/05/21 19:58:14]

We should put the code in the file in 'ibus' namespace too

[Seigo Nonaka, 2012/05/21 20:12:00]

Done.

+using chromeos::ibus::IBusText;
+using chromeos::ibus::PopIBusText;
+using chromeos::ibus::PopStringFromIBusText;
+using chromeos::ibus::AppendIBusText;
+using chromeos::ibus::AppendStringAsIBusText;
+
 ///////////////////////////////////////////////////////////////////////////////
 // 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 81 matching lines @@
   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::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::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;
   return reader->InitWithParentReader(contents_reader_.get());
 }
 
 bool IBusObjectReader::IsValid() const {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   return check_result_ == IBUS_OBJECT_VALID;
 }
 
-dbus::MessageReader* IBusObjectReader::GetContentsReader() {
-  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
-  DCHECK(contents_reader_.get());
-  if (IsValid()) {
-    return contents_reader_.get();
-  } else {
-    return NULL;
-  }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 //  IBusObjectWriter
 IBusObjectWriter::IBusObjectWriter(const std::string& type_name,
                                    const std::string& signature,
                                    dbus::MessageWriter* writer)
     : type_name_(type_name),
       signature_(signature),
       original_writer_(writer) {
   if (original_writer_)
     Init();
@@ skipping 21 matching lines @@
   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::AppendIBusText(text, contents_writer_.get());
+}
+
+void IBusObjectWriter::AppendStringAsIBusText(const std::string& text) {
+  DCHECK(IsInitialized());
+  chromeos::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;
 }
 
-dbus::MessageWriter* IBusObjectWriter::GetContentsWriter() {
-  DCHECK(contents_writer_.get());
-  if (IsInitialized()) {
-    return contents_writer_.get();
-  } else {
-    return NULL;
-  }
-}
-
 }  // namespace chromeos