summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2003-04-08 23:53:34 (UTC)
committer benmeyer <benmeyer>2003-04-08 23:53:34 (UTC)
commit17ba7a490ca74c491cfb11df52b44ef7826d1297 (patch) (unidiff)
treec5c7defdacd6b4f231baf97380ad69192c3dbde1
parent89100a32b43b7eda68aaa19bc275a0fb7ce36e30 (diff)
downloadopie-17ba7a490ca74c491cfb11df52b44ef7826d1297.zip
opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.gz
opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.bz2
kde updates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/info.ui22
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp14
2 files changed, 8 insertions, 28 deletions
diff --git a/noncore/settings/networksettings/wlan/info.ui b/noncore/settings/networksettings/wlan/info.ui
index 7a5bf0b..50ee540 100644
--- a/noncore/settings/networksettings/wlan/info.ui
+++ b/noncore/settings/networksettings/wlan/info.ui
@@ -293,29 +293,7 @@
293 </widget> 293 </widget>
294 </grid> 294 </grid>
295 </widget> 295 </widget>
296 </widget> 296 </widget>
297 </vbox> 297 </vbox>
298</widget> 298</widget>
299<customwidgets>
300 <customwidget>
301 <class>QWidget</class>
302 <header location="local">qwidget.h</header>
303 <sizehint>
304 <width>100</width>
305 <height>100</height>
306 </sizehint>
307 <container>0</container>
308 <sizepolicy>
309 <hordata>7</hordata>
310 <verdata>7</verdata>
311 </sizepolicy>
312 <pixmap>image0</pixmap>
313 </customwidget>
314</customwidgets>
315<images>
316 <image>
317 <name>image0</name>
318 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
319 </image>
320</images>
321</UI> 299</UI>
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 3797e22..57266bb 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -10,15 +10,18 @@
10#include <qspinbox.h> 10#include <qspinbox.h>
11#include <qradiobutton.h> 11#include <qradiobutton.h>
12#include <qcheckbox.h> 12#include <qcheckbox.h>
13#include <qtabwidget.h> 13#include <qtabwidget.h>
14#include <qcombobox.h> 14#include <qcombobox.h>
15 15
16/* system() */ 16#ifdef QTE_VERSION
17//#include <stdlib.h> 17 #include <opie/oprocess.h>
18#include <opie/oprocess.h> 18#else
19 #define OProcess KProcess
20 #include <kprocess.h>
21#endif
19 22
20#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" 23#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
21 24
22/** 25/**
23 * Constructor, read in the wireless.opts file for parsing later. 26 * Constructor, read in the wireless.opts file for parsing later.
24 */ 27 */
@@ -223,20 +226,19 @@ void WLANImp::accept(){
223 changeAndSaveSettingFile(); 226 changeAndSaveSettingFile();
224 227
225 // Try to save the interfaces settings. 228 // Try to save the interfaces settings.
226 if(!interfaceSetup->saveChanges()) 229 if(!interfaceSetup->saveChanges())
227 return; 230 return;
228 231
229 OProcess insert(QString("sh")); 232 OProcess insert;
233 insert << "sh";
230 insert << "-c"; 234 insert << "-c";
231 insert << "cardctl eject && cardctl insert"; 235 insert << "cardctl eject && cardctl insert";
232 236
233 if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { 237 if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) {
234 qWarning("could not start cardctl"); 238 qWarning("could not start cardctl");
235 } 239 }
236 240
237 // Close out the dialog 241 // Close out the dialog
238 QDialog::accept(); 242 QDialog::accept();
239} 243}
240 244
241// wlanimp.cpp
242