1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
--- nunome/dicman/nnmDicman.cpp~nunome.patch
+++ nunome/dicman/nnmDicman.cpp
@@ -1,75 +1,4 @@
-/*
- $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
-
- Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
-
- This file is part of Nunome-Qtopia.
-
- Nunome-Qtopia 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, or (at your option)
- any later version.
-
- Nunome-Qtopia 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 Nunome; see the file COPYING. If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* Dictinary maintenance tool */
-
-#include <qpeapplication.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <signal.h>
-
-extern "C" {
-#include "Nnm.h"
-#include "NnmFeature.h"
-#include "nnmStub.h"
-#include "NnmProto.h"
-}
-#include "nnmCanvas.h"
-
-class uiWidget : public QWidget
-{
-Q_OBJECT
-
-public:
- uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
-
- int serverPID;
- char *dictionaryPath;
-
-private slots:
- void regist( void );
- void clear( void );
- void quit( void );
-
- void format( const QString & );
-
-private:
- nnmCanvas *canvas;
- QLineEdit *input;
- ulong code;
-
- void updateDictionary( void );
-};
-
-#include "moc_nnmDicman.cpp"
+#include "nnmDicman.h"
uiWidget::uiWidget( QWidget *parent, const char *name, WFlags f )
: QWidget( parent, name, f )
--- nunome/ui/nunome.cpp~nunome.patch
+++ nunome/ui/nunome.cpp
@@ -22,7 +22,7 @@
/* Nunome input-method */
-#include <qpeapplication.h>
+#include <qpe/qpeapplication.h>
#include <qpainter.h>
#include <qpixmap.h>
#include <qwidget.h>
--- nunome/ui/nunome.h~nunome.patch
+++ nunome/ui/nunome.h
@@ -32,14 +32,14 @@
#include "nnmSelect.h"
#include "nnmSymbol.h"
-#define PARAMETER_FILE_PATH "/usr/local/share/nunome/.nunome"
+#define PARAMETER_FILE_PATH "/opt/QtPalmtop/share/nunome/.nunome"
-#define DEFAULT_SYSTEM_DICTIONARY "/usr/local/share/nunome/nunome_uni.dic"
-#define DEFAULT_USER_DICTIONARY "/usr/local/share/nunome/user.dic"
+#define DEFAULT_SYSTEM_DICTIONARY "/opt/QtPalmtop/share/nunome/nunome_uni.dic"
+#define DEFAULT_USER_DICTIONARY "/opt/QtPalmtop/share/nunome/user.dic"
#define DEFAULT_TIMEOUT_MSEC 500
#define DEFAULT_LEARN_FLAG true
-#define DEFAULT_SERVER_PROGRAM_PATH "/usr/local/share/nunome/nnmsrv"
-#define DEFAULT_LEARN_PROGRAM_PATH "/usr/local/share/nunome/nnmDicman"
+#define DEFAULT_SERVER_PROGRAM_PATH "/opt/QtPalmtop/bin/nnmsrv"
+#define DEFAULT_LEARN_PROGRAM_PATH "/opt/QtPalmtop/bin/nnmDicman"
class nnmParameter
{
--- nunome/ui/nunomeImpl.h~nunome.patch
+++ nunome/ui/nunomeImpl.h
@@ -23,7 +23,7 @@
#ifndef NUNOMEIMPL_H
#define NUNOMEIMPL_H
-#include <inputmethodinterface.h>
+#include <qpe/inputmethodinterface.h>
class Nunome;
class QPixmap;
--- /dev/null
+++ nunome/dicman/nnmDicman.h
@@ -0,0 +1,70 @@
+/*
+ $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
+
+ Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
+
+ This file is part of Nunome-Qtopia.
+
+ Nunome-Qtopia 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, or (at your option)
+ any later version.
+
+ Nunome-Qtopia 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 Nunome; see the file COPYING. If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+/* Dictinary maintenance tool */
+
+#include <qpe/qpeapplication.h>
+#include <qlabel.h>
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qwidget.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+#include <qlineedit.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+
+extern "C" {
+#include "Nnm.h"
+#include "NnmFeature.h"
+#include "nnmStub.h"
+#include "NnmProto.h"
+}
+#include "nnmCanvas.h"
+
+class uiWidget : public QWidget
+{
+Q_OBJECT
+
+public:
+ uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
+
+ int serverPID;
+ char *dictionaryPath;
+
+private slots:
+ void regist( void );
+ void clear( void );
+ void quit( void );
+
+ void format( const QString & );
+
+private:
+ nnmCanvas *canvas;
+ QLineEdit *input;
+ ulong code;
+
+ void updateDictionary( void );
+};
|
