author | benmeyer <benmeyer> | 2003-04-08 23:53:34 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2003-04-08 23:53:34 (UTC) |
commit | 17ba7a490ca74c491cfb11df52b44ef7826d1297 (patch) (side-by-side diff) | |
tree | c5c7defdacd6b4f231baf97380ad69192c3dbde1 | |
parent | 89100a32b43b7eda68aaa19bc275a0fb7ce36e30 (diff) | |
download | opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.zip opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.gz opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.bz2 |
kde updates
-rw-r--r-- | noncore/settings/networksettings/wlan/info.ui | 22 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 12 |
2 files changed, 7 insertions, 27 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 @@ -287,35 +287,13 @@ <cstring>TextLabel1_2</cstring> </property> <property stdset="1"> <name>text</name> <string>Signal</string> </property> </widget> </grid> </widget> </widget> </vbox> </widget> -<customwidgets> - <customwidget> - <class>QWidget</class> - <header location="local">qwidget.h</header> - <sizehint> - <width>100</width> - <height>100</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>7</hordata> - <verdata>7</verdata> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> -</customwidgets> -<images> - <image> - <name>image0</name> - <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> - </image> -</images> </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 @@ -4,27 +4,30 @@ #include <qfile.h> #include <qdir.h> #include <qtextstream.h> #include <qmessagebox.h> #include <qlineedit.h> #include <qlabel.h> #include <qspinbox.h> #include <qradiobutton.h> #include <qcheckbox.h> #include <qtabwidget.h> #include <qcombobox.h> -/* system() */ -//#include <stdlib.h> +#ifdef QTE_VERSION #include <opie/oprocess.h> +#else + #define OProcess KProcess + #include <kprocess.h> +#endif #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" /** * Constructor, read in the wireless.opts file for parsing later. */ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); tabWidget->insertTab(interfaceSetup, "TCP/IP"); // Read in the config file. QString wlanFile = WIRELESS_OPTS; @@ -217,26 +220,25 @@ void WLANImp::accept(){ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){ QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); return; } // Ok settings are good here, save changeAndSaveSettingFile(); // Try to save the interfaces settings. if(!interfaceSetup->saveChanges()) return; - OProcess insert(QString("sh")); + OProcess insert; + insert << "sh"; insert << "-c"; insert << "cardctl eject && cardctl insert"; if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { qWarning("could not start cardctl"); } // Close out the dialog QDialog::accept(); } -// wlanimp.cpp - |