author | simon <simon> | 2002-03-25 19:33:54 (UTC) |
---|---|---|
committer | simon <simon> | 2002-03-25 19:33:54 (UTC) |
commit | 56f2a47633046a7b08fe59acfe646a648c006230 (patch) (unidiff) | |
tree | dc7087aa3f346e3ff97fd3c52ffc6f5225813bfe | |
parent | 25fd130f6e411585e222c1bc0fe068344745ab77 (diff) | |
download | opie-56f2a47633046a7b08fe59acfe646a648c006230.zip opie-56f2a47633046a7b08fe59acfe646a648c006230.tar.gz opie-56f2a47633046a7b08fe59acfe646a648c006230.tar.bz2 |
- fixed warning about shadowing of name variable
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index fea673c..b3edbc1 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -88,98 +88,98 @@ static char * vmemo_xpm[] = { | |||
88 | "' c #343434", | 88 | "' c #343434", |
89 | ") c #060606", | 89 | ") c #060606", |
90 | "! c #444444", | 90 | "! c #444444", |
91 | "~ c #646464", | 91 | "~ c #646464", |
92 | "{ c #505050", | 92 | "{ c #505050", |
93 | "] c #717171", | 93 | "] c #717171", |
94 | "^ c #1B1B1B", | 94 | "^ c #1B1B1B", |
95 | "/ c #585858", | 95 | "/ c #585858", |
96 | "( c #4C4C4C", | 96 | "( c #4C4C4C", |
97 | "_ c #353535", | 97 | "_ c #353535", |
98 | ": c #0E0E0E", | 98 | ": c #0E0E0E", |
99 | "< c #080808", | 99 | "< c #080808", |
100 | "[ c #262626", | 100 | "[ c #262626", |
101 | "} c #121212", | 101 | "} c #121212", |
102 | "| c #7F7F7F", | 102 | "| c #7F7F7F", |
103 | "1 c #464646", | 103 | "1 c #464646", |
104 | "2 c #0C0C0C", | 104 | "2 c #0C0C0C", |
105 | "3 c #727272", | 105 | "3 c #727272", |
106 | "4 c #292929", | 106 | "4 c #292929", |
107 | "5 c #656565", | 107 | "5 c #656565", |
108 | "6 c #565656", | 108 | "6 c #565656", |
109 | "7 c #434343", | 109 | "7 c #434343", |
110 | "8 c #272727", | 110 | "8 c #272727", |
111 | "9 c #0F0F0F", | 111 | "9 c #0F0F0F", |
112 | "0 c #3A3A3A", | 112 | "0 c #3A3A3A", |
113 | "a c #090909", | 113 | "a c #090909", |
114 | "b c #535353", | 114 | "b c #535353", |
115 | "c c #545454", | 115 | "c c #545454", |
116 | "d c #494949", | 116 | "d c #494949", |
117 | "e c #7A7A7A", | 117 | "e c #7A7A7A", |
118 | "f c #202020", | 118 | "f c #202020", |
119 | "g c #3D3D3D", | 119 | "g c #3D3D3D", |
120 | "h c #1F1F1F", | 120 | "h c #1F1F1F", |
121 | " .+@ ", | 121 | " .+@ ", |
122 | " #$%&* ", | 122 | " #$%&* ", |
123 | " =-;>,')", | 123 | " =-;>,')", |
124 | " .$;!~,)", | 124 | " .$;!~,)", |
125 | " ;#{]!)", | 125 | " ;#{]!)", |
126 | " ^~/(_)", | 126 | " ^~/(_)", |
127 | " ./:@<[)", | 127 | " ./:@<[)", |
128 | " }. .|]1;;2 ", | 128 | " }. .|]1;;2 ", |
129 | " #-$;^/3&;;4@ ", | 129 | " #-$;^/3&;;4@ ", |
130 | ".$;;#5:67;89 ", | 130 | ".$;;#5:67;89 ", |
131 | ":%;0%&ab;8. ", | 131 | ":%;0%&ab;8. ", |
132 | "@cd%e!fg49 ", | 132 | "@cd%e!fg49 ", |
133 | " h0,!_;2@ ", | 133 | " h0,!_;2@ ", |
134 | " ))))) "}; | 134 | " ))))) "}; |
135 | 135 | ||
136 | VMemo::VMemo( QWidget *parent, const char *name ) | 136 | VMemo::VMemo( QWidget *parent, const char *_name ) |
137 | : QWidget( parent, name ) | 137 | : QWidget( parent, _name ) |
138 | { | 138 | { |
139 | setFixedHeight( 18 ); | 139 | setFixedHeight( 18 ); |
140 | setFixedWidth( 14 ); | 140 | setFixedWidth( 14 ); |
141 | 141 | ||
142 | recording = FALSE; | 142 | recording = FALSE; |
143 | 143 | ||
144 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 144 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
145 | if (uname(&name) != -1) { | 145 | if (uname(&name) != -1) { |
146 | QString release=name.release; | 146 | QString release=name.release; |
147 | if(release.find("embedix",0,TRUE) !=-1) | 147 | if(release.find("embedix",0,TRUE) !=-1) |
148 | systemZaurus=TRUE; | 148 | systemZaurus=TRUE; |
149 | else { | 149 | else { |
150 | systemZaurus=FALSE; | 150 | systemZaurus=FALSE; |
151 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 151 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
152 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), | 152 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), |
153 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 153 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
154 | 154 | ||
155 | // // Register the REC key press, for ipaq only | 155 | // // Register the REC key press, for ipaq only |
156 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); | 156 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); |
157 | e << 4096; | 157 | e << 4096; |
158 | e << QString("QPE/VMemo"); | 158 | e << QString("QPE/VMemo"); |
159 | e << QString("toggleRecord()"); | 159 | e << QString("toggleRecord()"); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
164 | VMemo::~VMemo() | 164 | VMemo::~VMemo() |
165 | { | 165 | { |
166 | } | 166 | } |
167 | 167 | ||
168 | void VMemo::receive( const QCString &msg, const QByteArray &data ) | 168 | void VMemo::receive( const QCString &msg, const QByteArray &data ) |
169 | { | 169 | { |
170 | QDataStream stream( data, IO_ReadOnly ); | 170 | QDataStream stream( data, IO_ReadOnly ); |
171 | if (msg == "toggleRecord()") | 171 | if (msg == "toggleRecord()") |
172 | { | 172 | { |
173 | if (recording) | 173 | if (recording) |
174 | mouseReleaseEvent(NULL); | 174 | mouseReleaseEvent(NULL); |
175 | else | 175 | else |
176 | mousePressEvent(NULL); | 176 | mousePressEvent(NULL); |
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | void VMemo::paintEvent( QPaintEvent* ) | 180 | void VMemo::paintEvent( QPaintEvent* ) |
181 | { | 181 | { |
182 | QPainter p(this); | 182 | QPainter p(this); |
183 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); | 183 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); |
184 | } | 184 | } |
185 | 185 | ||