Tomotaka SUWA
t-suw****@users*****
2005年 10月 8日 (土) 00:08:37 JST
Index: AquaSKK/util/NSObjectContainer.h
diff -u AquaSKK/util/NSObjectContainer.h:1.1.1.2 AquaSKK/util/NSObjectContainer.h:removed
--- AquaSKK/util/NSObjectContainer.h:1.1.1.2 Sun Jul 17 19:50:32 2005
+++ AquaSKK/util/NSObjectContainer.h Sat Oct 8 00:08:37 2005
@@ -1,37 +0,0 @@
-/*
- $Id: NSObjectContainer.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#pragma once
-#include <Foundation/Foundation.h>
-
-class NSObjectContainer
-{
- protected:
- NSObject* content;
-
- public:
- NSObjectContainer(NSObject* obj);
- NSObjectContainer(const NSObjectContainer& obj_container);
- virtual ~NSObjectContainer();
-
- virtual void setContent(NSObject* obj);
- virtual NSObject* getContent() const;
-};
\ No newline at end of file
Index: AquaSKK/util/NSObjectContainer.mm
diff -u AquaSKK/util/NSObjectContainer.mm:1.1.1.2 AquaSKK/util/NSObjectContainer.mm:removed
--- AquaSKK/util/NSObjectContainer.mm:1.1.1.2 Sun Jul 17 19:50:32 2005
+++ AquaSKK/util/NSObjectContainer.mm Sat Oct 8 00:08:37 2005
@@ -1,48 +0,0 @@
-/*
- $Id: NSObjectContainer.mm,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "NSObjectContainer.h"
-
-NSObjectContainer::NSObjectContainer(NSObject* obj)
-{
- content = [obj retain];
-}
-
-NSObjectContainer::NSObjectContainer(const NSObjectContainer& obj_container)
-{
- content = [obj_container.getContent() retain];
-}
-
-NSObjectContainer::~NSObjectContainer()
-{
- [content release];
-}
-
-void NSObjectContainer::setContent(NSObject* obj)
-{
- [content release];
- content = [obj retain];
-}
-
-NSObject* NSObjectContainer::getContent() const
-{
- return content;
-}
\ No newline at end of file
Index: AquaSKK/util/StringTokenizer.cpp
diff -u AquaSKK/util/StringTokenizer.cpp:1.2 AquaSKK/util/StringTokenizer.cpp:removed
--- AquaSKK/util/StringTokenizer.cpp:1.2 Tue Sep 6 10:25:13 2005
+++ AquaSKK/util/StringTokenizer.cpp Sat Oct 8 00:08:37 2005
@@ -1,59 +0,0 @@
-/*
- $Id: StringTokenizer.cpp,v 1.2 2005/09/06 01:25:13 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include <string>
-#include "StringTokenizer.h"
-
-StringTokenizer::StringTokenizer(
- const std::string& word, const std::string& delim)
- : word_(word), delim_(delim) , pos_(0) {
- // empty
-}
-
-StringTokenizer::~StringTokenizer() {
- // empty
-}
-
-bool StringTokenizer::hasMoreTokens()
-{
- // posÈ~Éf~^ÅÈ¢¶ªêÂÅà¶Ý·êÎtrueB
- return word_.find_first_not_of(delim_, pos_) != std::string::npos;
-}
-
-std::string StringTokenizer::nextToken()
-{
- // posÈ~Af~^ÅÈ¢¶ª»êéÜÅXLbv
- size_t pos_not_delim = word_.find_first_not_of(delim_, pos_);
- if(pos_not_delim == std::string::npos) {
- throw std::string("NoMoreTokensException");
- }
-
- // Éf~^ª»êéêðT·
- size_t pos_next_delim = word_.find_first_of(delim_, pos_not_delim + 1);
- if(pos_next_delim == std::string::npos) {
- // ÅãÌg[N
- pos_ = word_.length();
- return word_.substr(pos_not_delim, word_.length() - pos_not_delim);
- } else {
- pos_ = pos_next_delim + 1;
- return word_.substr(pos_not_delim, pos_next_delim - pos_not_delim);
- }
-}
Index: AquaSKK/util/StringTokenizer.h
diff -u AquaSKK/util/StringTokenizer.h:1.2 AquaSKK/util/StringTokenizer.h:removed
--- AquaSKK/util/StringTokenizer.h:1.2 Tue Sep 6 10:25:13 2005
+++ AquaSKK/util/StringTokenizer.h Sat Oct 8 00:08:37 2005
@@ -1,39 +0,0 @@
-/*
- $Id: StringTokenizer.h,v 1.2 2005/09/06 01:25:13 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#pragma once
-
-namespace util {
- class StringTokenizer;
-}
-
-class StringTokenizer {
- std::string word_;
- std::string delim_;
- size_t pos_;
-
-public:
- StringTokenizer(const std::string& word, const std::string& delim);
- virtual ~StringTokenizer();
-
- virtual bool hasMoreTokens();
- virtual std::string nextToken();
-};
Index: AquaSKK/util/StringUtils.cpp
diff -u AquaSKK/util/StringUtils.cpp:1.1.1.2 AquaSKK/util/StringUtils.cpp:removed
--- AquaSKK/util/StringUtils.cpp:1.1.1.2 Sun Jul 17 19:50:32 2005
+++ AquaSKK/util/StringUtils.cpp Sat Oct 8 00:08:37 2005
@@ -1,54 +0,0 @@
-/*
- $Id: StringUtils.cpp,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "StringUtils.h"
-#include <ctype.h>
-using namespace std;
-
-string util::toLower(const string& src)
-{
- string result;
-
- const unsigned int len = src.length();
- for (unsigned int i = 0;i < len;i++)
- {
- result.append(1,
- static_cast<char>(
- ::tolower(static_cast<int>(src[i]))
- ));
- }
- return result;
-}
-
-string util::join(const char delimitor,const vector<string>& vec)
-{
- string result;
-
- for (vector<string>::const_iterator ite = vec.begin();ite != vec.end();ite++)
- {
- result += *ite + delimitor;
- }
-
- if (result.length() > 0)
- return string(result.begin(),result.end()-1);
-
- return result;
-}
Index: AquaSKK/util/StringUtils.h
diff -u AquaSKK/util/StringUtils.h:1.1.1.2 AquaSKK/util/StringUtils.h:removed
--- AquaSKK/util/StringUtils.h:1.1.1.2 Sun Jul 17 19:50:32 2005
+++ AquaSKK/util/StringUtils.h Sat Oct 8 00:08:37 2005
@@ -1,32 +0,0 @@
-/*
- $Id: StringUtils.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $
- ---------
-
- MacOS X implementation of the SKK input method.
- Copyright (C) 2002 phonohawk
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#pragma once
-
-#include <string>
-#include <vector>
-using namespace std;
-namespace util
-{
- string toLower(const string& src);
- string join(const char delimitor,const vector<string>& vec);
-}
-