Fixed compiler warnings

4 files changed, 21 insertions, 7 deletions

diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index b9b09ad..f6eed00 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -192,13 +192,13 @@ bool Interface::refresh(){
     line = stream.readLine();
   }
   file.close();
   long time = 0;
   // 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 "
   //   nice 0   itrealvalue starttime
       "%*d  %*d %*d %lu", (long*) &time);
   time = time/100;
   
diff --git a/noncore/settings/networksettings/interfaceinformationimp.h b/noncore/settings/networksettings/interfaceinformationimp.h
index 6fc2384..c8a478e 100644
--- a/noncore/settings/networksettings/interfaceinformationimp.h
+++ b/noncore/settings/networksettings/interfaceinformationimp.h
@@ -15,15 +15,15 @@ public:
 private slots:
   void start();
   void stop();
   void refresh();
   void restart();
   void advanced();
-  Interface *interface;
 
 private:
+  Interface *interface;
   void updateInterface();
   
 };
 
 #endif
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 3c13143..ad9362f 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,10 +1,13 @@
 #include "mainwindowimp.h"

 #include "addserviceimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

+#include "interface.h"

+#include "kprocess.h"

+#include "module.h"

 

 #include <qpushbutton.h>

 #include <qdir.h>

 #include <qtabwidget.h>

 #include <qmainwindow.h>

 #include <qmessagebox.h>

@@ -47,18 +50,26 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   }

 

   // Load any saved services.

   loadModules(path);

   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(" "));

+  }

 }

 

 void MainWindowImp::loadModules(QString path){

 }

 

 /**

@@ -249,13 +260,13 @@ void MainWindowImp::jobDone(KProcess *process){
       QString hardName = "Ethernet";

       int hardwareName = line.find("Link encap:");

       int macAddress = line.find("HWaddr");

       if(macAddress == -1)

         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());

       interfaceNames.insert(i->getInterfaceName(), i);

       updateInterface(i);

     }

   }

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 95ec2a1..0618dd2 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -1,16 +1,17 @@
 #ifndef MAINWINOWIMP_H

 #define MAINWINOWIMP_H

 

 #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 {

   Q_OBJECT

 

 public:

   MainWindowImp(QWidget *parent=0, const char *name=0);

@@ -42,12 +43,14 @@ private:
   QMap<Module*, QLibrary*> libraries;

   QMap<Interface*, Module*> modules;

   QMap<Interface*, QListViewItem*> items;

   QMap<QListViewItem*, Interface*> interfaceItems;

   

   QMap<KProcess*, QString> threads;

+  QStringList profiles;

+

 };

 

 #endif

 

 // mainwindowimp.h