summaryrefslogtreecommitdiff
authorschurig <schurig>2003-06-17 06:33:33 (UTC)
committer schurig <schurig>2003-06-17 06:33:33 (UTC)
commit9d006f21949fc9a25e323e2fd20fab0bfb249b49 (patch) (unidiff)
treece5f2946ffc45d1108ac9612d5915db99818aa4f
parent0462357c9cad9f271b88f04615acaba4898cbf81 (diff)
downloadopie-9d006f21949fc9a25e323e2fd20fab0bfb249b49.zip
opie-9d006f21949fc9a25e323e2fd20fab0bfb249b49.tar.gz
opie-9d006f21949fc9a25e323e2fd20fab0bfb249b49.tar.bz2
qpeDir() already has the trailing slash
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 544498f..8ea241d 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -38,65 +38,65 @@
38#include <qptrlist.h> 38#include <qptrlist.h>
39#endif 39#endif
40#include <qdir.h> 40#include <qdir.h>
41#include <qfile.h> 41#include <qfile.h>
42#include <qtextstream.h> 42#include <qtextstream.h>
43#include <qregexp.h> 43#include <qregexp.h>
44 44
45#include <net/if.h> 45#include <net/if.h>
46#include <sys/ioctl.h> 46#include <sys/ioctl.h>
47#include <sys/socket.h> 47#include <sys/socket.h>
48 48
49#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" 49#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
50#define _PROCNETDEV "/proc/net/dev" 50#define _PROCNETDEV "/proc/net/dev"
51 51
52MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){ 52MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){
53 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); 53 connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
54 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 54 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
55 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 55 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
56 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 56 connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
57 57
58 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 58 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
59 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 59 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
60 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); 60 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
61 61
62 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); 62 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
63 63
64 //FIXME: disable profiles for the moment: 64 //FIXME: disable profiles for the moment:
65// tabWidget->setTabEnabled( tab, false ); 65// tabWidget->setTabEnabled( tab, false );
66 66
67 // Load connections. 67 // Load connections.
68 // /usr/local/kde/lib/libinterfaces.la 68 // /usr/local/kde/lib/libinterfaces.la
69#ifdef QWS 69#ifdef QWS
70 loadModules(QPEApplication::qpeDir() + "/plugins/networksettings"); 70 loadModules(QPEApplication::qpeDir() + "plugins/networksettings");
71#else 71#else
72 loader = KLibLoader::self(); 72 loader = KLibLoader::self();
73 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); 73 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
74#endif 74#endif
75 getAllInterfaces(); 75 getAllInterfaces();
76 76
77 Interfaces i; 77 Interfaces i;
78 QStringList list = i.getInterfaceList(); 78 QStringList list = i.getInterfaceList();
79 QMap<QString, Interface*>::Iterator it; 79 QMap<QString, Interface*>::Iterator it;
80 for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { 80 for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {
81 bool found = false; 81 bool found = false;
82 for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ 82 for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){
83 if(it.key() == (*ni)) 83 if(it.key() == (*ni))
84 found = true; 84 found = true;
85 } 85 }
86 if(!found){ 86 if(!found){
87 if(!(*ni).contains("_")){ 87 if(!(*ni).contains("_")){
88 Interface *i = new Interface(this, *ni, false); 88 Interface *i = new Interface(this, *ni, false);
89 i->setAttached(false); 89 i->setAttached(false);
90 i->setHardwareName(tr("Disconnected")); 90 i->setHardwareName(tr("Disconnected"));
91 interfaceNames.insert(i->getInterfaceName(), i); 91 interfaceNames.insert(i->getInterfaceName(), i);
92 updateInterface(i); 92 updateInterface(i);
93 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); 93 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
94 } 94 }
95 } 95 }
96 } 96 }
97 97
98 //getInterfaceList(); 98 //getInterfaceList();
99 connectionList->header()->hide(); 99 connectionList->header()->hide();
100 100
101 Config cfg("NetworkSetup"); 101 Config cfg("NetworkSetup");
102 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 102 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));