author | benmeyer <benmeyer> | 2002-09-30 14:46:34 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-09-30 14:46:34 (UTC) |
commit | d79ae2969e74b1caa8e562910715df4ffe1739b3 (patch) (side-by-side diff) | |
tree | 1808d0d3747581ca999ec42b4bb029471a1aa199 /noncore/net/networksetup | |
parent | 9965bd5c49ff2f22d640d132ac343fdec97b3fb4 (diff) | |
download | opie-d79ae2969e74b1caa8e562910715df4ffe1739b3.zip opie-d79ae2969e74b1caa8e562910715df4ffe1739b3.tar.gz opie-d79ae2969e74b1caa8e562910715df4ffe1739b3.tar.bz2 |
Fixed compiler warnings
-rw-r--r-- | noncore/net/networksetup/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaceinformationimp.h | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 15 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.h | 9 |
4 files changed, 21 insertions, 7 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp index b9b09ad..f6eed00 100644 --- a/noncore/net/networksetup/interface.cpp +++ b/noncore/net/networksetup/interface.cpp @@ -196,5 +196,5 @@ bool Interface::refresh(){ // Grab the start time // pid com state ppid pgrp session tty_nr tpgid flags - int r = sscanf(line.latin1(), "%*d %*s %*c %*d %*d %*d %*d %*d %*u " + sscanf(line.latin1(), "%*d %*s %*c %*d %*d %*d %*d %*d %*u " // minflt cminflt majflt cmajflt utime stime cutime cstime priority "%*u %*u %*u %*u %*u %*u %*d %*d %*d " diff --git a/noncore/net/networksetup/interfaceinformationimp.h b/noncore/net/networksetup/interfaceinformationimp.h index 6fc2384..c8a478e 100644 --- a/noncore/net/networksetup/interfaceinformationimp.h +++ b/noncore/net/networksetup/interfaceinformationimp.h @@ -19,7 +19,7 @@ private slots: void restart(); void advanced(); - Interface *interface; private: + Interface *interface; void updateInterface(); diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 3c13143..ad9362f 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp @@ -3,4 +3,7 @@ #include "interfaceinformationimp.h"
#include "interfacesetupimp.h"
+#include "interface.h"
+#include "kprocess.h"
+#include "module.h"
#include <qpushbutton.h>
@@ -51,10 +54,18 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par getInterfaceList();
serviceList->header()->hide();
+
+
+ Config cfg("NetworkSetup");
+ profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
}
/**
- * Deconstructor. Unload libraries and save.
+ * Deconstructor. Unload libraries and save profile list.
*/
MainWindowImp::~MainWindowImp(){
+ if(profiles.count() > 1){
+ Config cfg("NetworkSetup");
+ cfg.writeEntry("Profiles", profiles.join(" "));
+ }
}
@@ -253,5 +264,5 @@ void MainWindowImp::jobDone(KProcess *process){ macAddress = line.length();
if(hardwareName != -1)
- i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)));
+ i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));
// We have found an interface
//qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h index 95ec2a1..0618dd2 100644 --- a/noncore/net/networksetup/mainwindowimp.h +++ b/noncore/net/networksetup/mainwindowimp.h @@ -3,10 +3,11 @@ #include "mainwindow.h"
-#include "module.h"
-#include "interface.h"
-#include "kprocess.h"
#include <qmap.h>
+#include <qstringlist.h>
+class Module;
+class Interface;
class QLibrary;
+class KProcess;
class MainWindowImp : public MainWindow {
@@ -46,4 +47,6 @@ private: QMap<KProcess*, QString> threads;
+ QStringList profiles;
+
};
|