summaryrefslogtreecommitdiff
authordrw <drw>2004-02-22 17:06:57 (UTC)
committer drw <drw>2004-02-22 17:06:57 (UTC)
commit68bd0ee2c7806b8fb35caf796e1d623e3d1f6011 (patch) (side-by-side diff)
treebaee9d67d1134d1af933dfc21867c2607103813e
parenta607c211c7ad47f1083fa820da5632a1d2110e44 (diff)
downloadopie-68bd0ee2c7806b8fb35caf796e1d623e3d1f6011.zip
opie-68bd0ee2c7806b8fb35caf796e1d623e3d1f6011.tar.gz
opie-68bd0ee2c7806b8fb35caf796e1d623e3d1f6011.tar.bz2
Network Settings: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/config.in4
-rw-r--r--noncore/settings/networksettings/interfaces/.cvsignore3
-rw-r--r--noncore/settings/networksettings/interfaces/config.in2
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp6
-rw-r--r--noncore/settings/networksettings/main.cpp2
-rw-r--r--noncore/settings/networksettings/networksettings.pro2
-rw-r--r--noncore/settings/networksettings/opie-networksettings.control2
-rw-r--r--noncore/settings/networksettings/wlan/.cvsignore2
-rw-r--r--noncore/settings/networksettings/wlan/config.in4
-rw-r--r--noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control4
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp96
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp18
12 files changed, 74 insertions, 71 deletions
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index 4965a6e..e23e96a 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -2,10 +2,10 @@ config NETWORKSETUP
boolean "opie-networksettings (TCP/IP network settings)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2NET
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2NET
config NETWORKSETUP-CORE
boolean
default "y" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && INTERFACES
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && NETWORKSETUP && INTERFACES
source noncore/settings/networksettings/ppp/config.in
diff --git a/noncore/settings/networksettings/interfaces/.cvsignore b/noncore/settings/networksettings/interfaces/.cvsignore
index 1655b12..0b2d203 100644
--- a/noncore/settings/networksettings/interfaces/.cvsignore
+++ b/noncore/settings/networksettings/interfaces/.cvsignore
@@ -1,3 +1,2 @@
-
Makefile
Makefile.in
@@ -10,2 +9,4 @@ interfacesetup.h
lib*.so*
moc*
+.moc
+.obj \ No newline at end of file
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 6c21aeb..d84cd24 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -2,3 +2,3 @@
boolean
default "y" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 78466d0..ab0e4cc 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -13,5 +13,5 @@
#ifdef QWS
-#include <opie/owait.h>
+#include <opie2/owait.h>
#include <qpe/global.h>
#include <qapplication.h>
@@ -156,7 +156,7 @@ void InterfaceSetupImp::setProfile(const QString &profile){
interfaces->addMapping(interface->getInterfaceName());
if(!interfaces->setMapping(interface->getInterfaceName())){
- qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
+ qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
return;
- }
+ }
}
interfaces->setMap("map", newInterfaceName);
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp
index 5d275ac..bc11ab4 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/main.cpp
@@ -1,4 +1,4 @@
#include "mainwindowimp.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 0615ea4..5db2d6b 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -4,5 +4,5 @@ SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
INCLUDEPATH += $(OPIEDIR)/include interfaces/
DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
-LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie
+LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
INTERFACES = mainwindow.ui addconnection.ui
TARGET = networksettings
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 25e1e26..fbbddca 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -5,5 +5,5 @@ Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal, libopiecore2, libopienet2
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopienet2
Description: Network settings.
Replaces: opie-networksetup
diff --git a/noncore/settings/networksettings/wlan/.cvsignore b/noncore/settings/networksettings/wlan/.cvsignore
index 7073cac..ae45698 100644
--- a/noncore/settings/networksettings/wlan/.cvsignore
+++ b/noncore/settings/networksettings/wlan/.cvsignore
@@ -6,2 +6,4 @@ moc_*
wlan.cpp
wlan.h
+.moc
+.obj
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index e459788..97fa468 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -2,5 +2,5 @@
boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
default "n" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
- #comment "opie-networksettingsplugin-wlan needs libopie, libopie2net and networksetup"
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
+ #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
#depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP) \ No newline at end of file
diff --git a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
index 1147621..f4f20b1 100644
--- a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
+++ b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
@@ -1,9 +1,9 @@
Package: opie-networksettingsplugin-wlan
-Files: plugins/networksettings/libwlan.so*
+Files: plugins/networksettings/libwlan.so*
Priority: optional
Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: opie-networksettings, libopienet2
+Depends: opie-networksettings, libopiecore2, libopienet2
Description: Network settings wavelan plugin.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 719be1b..95f4abe 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -14,6 +14,6 @@
#include <qcombobox.h>
-#ifdef QWS
- #include <opie/oprocess.h>
+#ifdef QWS
+ #include <opie2/oprocess.h>
#else
#define OProcess KProcess
@@ -25,5 +25,5 @@
/**
* 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);
@@ -56,5 +56,5 @@ void WLANImp::typeChanged(int mod){
/**
* Change the profile for both wireless settings and network settings.
- */
+ */
void WLANImp::setProfile(const QString &profile){
interfaceSetup->setProfile(profile);
@@ -64,5 +64,5 @@ void WLANImp::setProfile(const QString &profile){
/**
* Parses the settings file that was read in and gets any setting from it.
- */
+ */
void WLANImp::parseSettingFile(){
bool foundCase = false;
@@ -73,5 +73,5 @@ void WLANImp::parseSettingFile(){
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
- if((foundCase && line.contains("esac")) ||
+ if((foundCase && line.contains("esac")) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#'))
found = true;
@@ -85,8 +85,8 @@ void WLANImp::parseSettingFile(){
if(id == "any"){
essAny->setChecked(false);
- }else{
+ }else{
essAny->setChecked(true);
- essSpecificLineEdit->setText(id);
- }
+ essSpecificLineEdit->setText(id);
+ }
}
if(line.contains("MODE=")){
@@ -94,12 +94,12 @@ void WLANImp::parseSettingFile(){
if(mode == "Managed"){
networkType->setCurrentItem(0);
- channelLabel->setEnabled(false);
- networkChannel->setEnabled(false);
- }
- else{
- networkType->setCurrentItem(1);
+ channelLabel->setEnabled(false);
+ networkChannel->setEnabled(false);
+ }
+ else{
+ networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
- channelLabel->setEnabled(true);
- }
+ channelLabel->setEnabled(true);
+ }
}
if(line.contains("#KEY0="))
@@ -111,22 +111,22 @@ void WLANImp::parseSettingFile(){
if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(6, line.length()));
-
+
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
- if(line.right(5) == (" open")){
- key = line.mid(4, line.length()-5);
- authOpen->setChecked(true);
- authShared->setChecked(false);
- }
- else{
- authOpen->setChecked(false);
- authShared->setChecked(true);
- key = line.mid(4, line.length());
- }
+ if(line.right(5) == (" open")){
+ key = line.mid(4, line.length()-5);
+ authOpen->setChecked(true);
+ authShared->setChecked(false);
+ }
+ else{
+ authOpen->setChecked(false);
+ authShared->setChecked(true);
+ key = line.mid(4, line.length());
+ }
if(key == keyLineEdit0->text()) keyRadio0->setChecked(true);
- if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
- if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
- if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
+ if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
+ if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
+ if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
}
if(line.contains("CHANNEL=")){
@@ -139,5 +139,5 @@ void WLANImp::parseSettingFile(){
/**
* Saves settings to the wireless.opts file using the current profile
- */
+ */
void WLANImp::changeAndSaveSettingFile(){
QString wlanFile = WIRELESS_OPTS;
@@ -149,5 +149,5 @@ void WLANImp::changeAndSaveSettingFile(){
return;
}
-
+
QTextStream stream( &file );
bool foundCase = false;
@@ -159,15 +159,15 @@ void WLANImp::changeAndSaveSettingFile(){
foundCase = true;
// See if we found our scheme to write or the sceme couldn't be found
- if((foundCase && line.contains("esac") && !found) ||
+ if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
-
+
if(!line.contains("esac"))
- stream << line << "\n";
+ stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
- stream << "\tMODE=Managed\n";
+ stream << "\tMODE=Managed\n";
}
else{
@@ -175,5 +175,5 @@ void WLANImp::changeAndSaveSettingFile(){
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
- }
+ }
stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
@@ -181,5 +181,5 @@ void WLANImp::changeAndSaveSettingFile(){
stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
-
+
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
@@ -188,13 +188,13 @@ void WLANImp::changeAndSaveSettingFile(){
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
- if(authOpen->isChecked())
- stream << " open";
- else
- stream << " restricted";
- stream << "\"\n";
+ if(authOpen->isChecked())
+ stream << " open";
+ else
+ stream << " restricted";
+ stream << "\"\n";
}
stream << "\tRATE=auto\n";
if(line.contains("esac"))
- stream << line << "\n";
+ stream << line << "\n";
}
if(line.contains(";;"))
@@ -216,14 +216,14 @@ void WLANImp::accept(){
return;
}
- }
-
+ }
+
if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a SSID.", QMessageBox::Ok);
return;
}
-
+
// Ok settings are good here, save
changeAndSaveSettingFile();
-
+
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index e7d6ff5..92339d6 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -29,5 +29,5 @@
#ifdef QWS
#include <qpe/resource.h>
- #include <opie/oprocess.h>
+ #include <opie2/oprocess.h>
#include <opie2/onetwork.h>
#include <opie2/opcap.h>
@@ -140,14 +140,14 @@ void WLANImp::parseKeyStr(QString keystr) {
case 1:
keyRadio0->setChecked(true);
- break;
+ break;
case 2:
keyRadio1->setChecked(true);
- break;
+ break;
case 3:
keyRadio2->setChecked(true);
- break;
+ break;
case 4:
keyRadio3->setChecked(true);
- break;
+ break;
}
} else {
@@ -171,14 +171,14 @@ void WLANImp::parseKeyStr(QString keystr) {
case 1:
keyLineEdit0->setText(key);
- break;
+ break;
case 2:
keyLineEdit1->setText(key);
- break;
+ break;
case 3:
keyLineEdit2->setText(key);
- break;
+ break;
case 4:
keyLineEdit3->setText(key);
- break;
+ break;
}
key = QString::null;