Hiroyuki Ikezoe
poinc****@ikezo*****
2005年 10月 11日 (火) 09:50:32 JST
zoeです。
glibc-2.3.5の環境で、scim-skkとscim-primeが入ってると、scim-setupがク
ラッシュします。
namespaceをつけてやるとクラッシュしなくなるので、つけた方がよさそうで
す。
片っ端からnamespace scim_skkをつけたパッチを添付します。
-------------- next part --------------
? p
Index: conv_table.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/conv_table.cpp,v
retrieving revision 1.4
diff -u -r1.4 conv_table.cpp
--- conv_table.cpp 16 Dec 2004 13:55:03 -0000 1.4
+++ conv_table.cpp 11 Oct 2005 00:46:59 -0000
@@ -2,6 +2,8 @@
#include "scim_skk_automaton.h"
+using namespace scim_skk;
+
/* from Suikyo but modified by mukai */
ConvRule skk_romakana_table[] = {
#if 0
Index: conv_table.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/conv_table.h,v
retrieving revision 1.3
diff -u -r1.3 conv_table.h
--- conv_table.h 16 Dec 2004 13:55:03 -0000 1.3
+++ conv_table.h 11 Oct 2005 00:46:59 -0000
@@ -1,5 +1,7 @@
#include "scim_skk_automaton.h"
+namespace scim_skk {
+
extern ConvRule skk_romakana_table[];
extern ConvRule ja_kana_table[];
extern ConvRule romakana_ja_period_rule[];
@@ -14,3 +16,4 @@
extern HiraganaKatakanaRule ja_hiragana_katakana_table[];
extern WideRule ja_wide_table[];
+}
Index: scim_skk_automaton.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_automaton.cpp,v
retrieving revision 1.2
diff -u -r1.2 scim_skk_automaton.cpp
--- scim_skk_automaton.cpp 15 Dec 2004 08:15:57 -0000 1.2
+++ scim_skk_automaton.cpp 11 Oct 2005 00:46:59 -0000
@@ -20,6 +20,8 @@
#include "scim_skk_automaton.h"
+using namespace scim_skk;
+
SKKAutomaton::SKKAutomaton ()
: m_table (NULL),
m_table_len (0),
Index: scim_skk_automaton.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_automaton.h,v
retrieving revision 1.1
diff -u -r1.1 scim_skk_automaton.h
--- scim_skk_automaton.h 13 Dec 2004 06:48:49 -0000 1.1
+++ scim_skk_automaton.h 11 Oct 2005 00:46:59 -0000
@@ -25,6 +25,7 @@
#include <scim.h>
using namespace scim;
+namespace scim_skk {
typedef struct _ConvRule
{
const char *string;
@@ -90,6 +91,7 @@
virtual void append_table (ConvRule *table);
virtual void remove_table (ConvRule *table);
};
+}
#endif /* __SCIM_ANTHY_AUTOMATON_H__ */
/*
vi:ts=4:nowrap:ai:expandtab
Index: scim_skk_core.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_core.cpp,v
retrieving revision 1.34
diff -u -r1.34 scim_skk_core.cpp
--- scim_skk_core.cpp 6 Oct 2005 08:47:07 -0000 1.34
+++ scim_skk_core.cpp 11 Oct 2005 00:46:59 -0000
@@ -26,6 +26,8 @@
#include "conv_table.h"
#include "scim_skk_dictionary.h"
+using namespace scim_skk;
+
extern SKKDictionary *scim_skkdict;
extern bool annot_view;
extern bool annot_pos;
Index: scim_skk_core.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_core.h,v
retrieving revision 1.12
diff -u -r1.12 scim_skk_core.h
--- scim_skk_core.h 20 Jun 2005 15:51:38 -0000 1.12
+++ scim_skk_core.h 11 Oct 2005 00:46:59 -0000
@@ -27,6 +27,7 @@
using namespace scim;
+namespace scim_skk {
typedef enum {
SKK_MODE_HIRAGANA,
SKK_MODE_KATAKANA,
@@ -137,5 +138,6 @@
bool action_prevpage (void);
void action_select_index (int i);
};
+}
#endif
Index: scim_skk_dictionary.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_dictionary.cpp,v
retrieving revision 1.18
diff -u -r1.18 scim_skk_dictionary.cpp
--- scim_skk_dictionary.cpp 7 Oct 2005 04:48:37 -0000 1.18
+++ scim_skk_dictionary.cpp 11 Oct 2005 00:46:59 -0000
@@ -34,6 +34,7 @@
#define SKKDICT_CHARCODE "EUC-JP"
using namespace std;
+using namespace scim_skk;
static IConvert converter;
@@ -53,6 +54,8 @@
inline WideString lltows(unsigned long long n);
inline unsigned long long wstoll(WideString ws);
+namespace scim_skk {
+
class SKKDictBase
{
public:
@@ -152,7 +155,7 @@
bool compare (const String &dictname);
bool compare (const String &host, const int port);
};
-
+}
SKKSysDict::SKKSysDict (const String &dictpath)
Index: scim_skk_dictionary.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_dictionary.h,v
retrieving revision 1.11
diff -u -r1.11 scim_skk_dictionary.h
--- scim_skk_dictionary.h 6 Oct 2005 08:47:07 -0000 1.11
+++ scim_skk_dictionary.h 11 Oct 2005 00:46:59 -0000
@@ -29,6 +29,7 @@
using namespace scim;
+namespace scim_skk {
class SKKDictBase;
class SKKUserDict;
@@ -56,4 +57,5 @@
void write (const WideString &key,
const Candidate &cand, const Annotation &annot);
};
+}
#endif
Index: scim_skk_imengine.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_imengine.cpp,v
retrieving revision 1.29
diff -u -r1.29 scim_skk_imengine.cpp
--- scim_skk_imengine.cpp 29 Jun 2005 05:31:26 -0000 1.29
+++ scim_skk_imengine.cpp 11 Oct 2005 00:46:59 -0000
@@ -70,6 +70,7 @@
#endif
+using namespace scim_skk;
static ConfigPointer _scim_config (0);
SKKDictionary *scim_skkdict = 0;
Index: scim_skk_imengine.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_imengine.h,v
retrieving revision 1.9
diff -u -r1.9 scim_skk_imengine.h
--- scim_skk_imengine.h 20 Jun 2005 15:51:38 -0000 1.9
+++ scim_skk_imengine.h 11 Oct 2005 00:46:59 -0000
@@ -35,6 +35,8 @@
using namespace scim;
+namespace scim_skk {
+
class SKKFactory : public IMEngineFactoryBase
{
friend class SKKInstance;
@@ -117,5 +119,6 @@
virtual void focus_out (void);
virtual void trigger_property (const String& property);
};
+}
#endif /* __SCIM_SKK_IMENGINE_H__ */
Index: scim_skk_keybind.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_keybind.cpp,v
retrieving revision 1.14
diff -u -r1.14 scim_skk_keybind.cpp
--- scim_skk_keybind.cpp 20 Jun 2005 15:51:38 -0000 1.14
+++ scim_skk_keybind.cpp 11 Oct 2005 00:46:59 -0000
@@ -20,6 +20,8 @@
#define Uses_SCIM_EVENT
#include "scim_skk_keybind.h"
+using namespace scim_skk;
+
#define qwerty_vec_len 7
#define dvorak_vec_len 8
#define number_vec_len 10
Index: scim_skk_keybind.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_keybind.h,v
retrieving revision 1.7
diff -u -r1.7 scim_skk_keybind.h
--- scim_skk_keybind.h 30 Jan 2005 15:38:29 -0000 1.7
+++ scim_skk_keybind.h 11 Oct 2005 00:46:59 -0000
@@ -24,6 +24,8 @@
using namespace scim;
+namespace scim_skk {
+
typedef enum {
SSTYLE_QWERTY,
SSTYLE_DVORAK,
@@ -103,5 +105,6 @@
void selection_labels (std::vector<WideString> &result);
};
+}
#endif /* __SCIM_SKK_KEYBINDS_H__ */
Index: scim_skk_lookup_table.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_lookup_table.cpp,v
retrieving revision 1.9
diff -u -r1.9 scim_skk_lookup_table.cpp
--- scim_skk_lookup_table.cpp 6 Oct 2005 08:47:07 -0000 1.9
+++ scim_skk_lookup_table.cpp 11 Oct 2005 00:46:59 -0000
@@ -19,6 +19,8 @@
#include "scim_skk_lookup_table.h"
+using namespace scim_skk;
+
extern bool annot_view;
extern bool annot_pos;
extern bool annot_target;
Index: scim_skk_lookup_table.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-skk/src/scim_skk_lookup_table.h,v
retrieving revision 1.6
diff -u -r1.6 scim_skk_lookup_table.h
--- scim_skk_lookup_table.h 6 Oct 2005 08:47:07 -0000 1.6
+++ scim_skk_lookup_table.h 11 Oct 2005 00:46:59 -0000
@@ -29,6 +29,8 @@
using namespace scim;
+namespace scim_skk {
+
typedef WideString Candidate;
typedef WideString Annotation;
@@ -88,4 +90,5 @@
void SKKCandList::get_annot_string (WideString &result);
};
+}
#endif