compile fixes

2 files changed, 3 insertions, 8 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 581b7e3..da21c05 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,54 +1,53 @@
 #include "mainwindowimp.h"

 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "interfaces.h"

 #include "module.h"

 

 #include <qpushbutton.h>

 #include <qlistbox.h>

 #include <qlineedit.h>

 #include <qlistview.h>

 #include <qheader.h>

 #include <qlabel.h>

 

 #include <qmessagebox.h>

 

 #ifdef QWS 

  #include <qpe/config.h>

  #include <qpe/qlibrary.h>

  #include <qpe/resource.h>

  #include <qpe/qpeapplication.h>

-// #define QLibrary Library

 #else

  #include <klibloader.h>

  #define QLibrary KLibrary

  #include <kconfig.h>

  #define Config KConfig

  #include <kapplication.h>

  #include <kstandarddirs.h>

  #include <kiconloader.h>

  #define showMaximized show

 #endif

 

 #if QT_VERSION < 300

 #include <qlist.h>

 #else

 #include <qptrlist.h>

 #endif

 #include <qdir.h>

 #include <qfile.h>

 #include <qtextstream.h>

 #include <qregexp.h>

 

 #include <net/if.h>

 #include <sys/ioctl.h>

 

 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

 

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){

   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));

   connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));

   connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));

   connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 

   

@@ -353,101 +352,101 @@ void MainWindowImp::removeClicked(){
   else{

     if(!i->getModuleOwner()->remove(i))

       QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok);

     else{

       QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);

       // TODO memory managment....

       // who deletes the interface?

     }

   }

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

   Interface *i = interfaceItems[item];

   if(i->getModuleOwner()){

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);

     if(moduleConfigure != NULL){

       moduleConfigure->showMaximized();

       return;

     }

   }

   

-  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);

+  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );

   QString currentProfileText = currentProfileLabel->text();

   if(currentProfileText.upper() == "ALL");

     currentProfileText = "";

   configure->setProfile(currentProfileText);

   configure->showMaximized();

 }

 

 /**

  * Pull up the information about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure.

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = connectionList->currentItem();

   if(!item){

     QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);

     return;

   } 

  

   Interface *i = interfaceItems[item];

   if(!i->isAttached()){

     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);

     return;

   }

 

   if(i->getModuleOwner()){

     QWidget *moduleInformation = i->getModuleOwner()->information(i);

     if(moduleInformation != NULL){

       moduleInformation->showMaximized();

 #ifdef DEBUG

       qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");

 #endif

       return;

     }

   } 

-  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);

+  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WType_Dialog);

   information->showMaximized();

 }

 

 /**

  * Update this interface.  If no QListViewItem exists create one.

  * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   if(!advancedUserMode){

     if(i->getInterfaceName() == "lo")

       return;

   }

   

   QListViewItem *item = NULL;

   

   // Find the interface, making it if needed.

   if(items.find(i) == items.end()){

     item = new QListViewItem(connectionList, "", "", "");

     // See if you can't find a module owner for this interface

     QMap<Module*, QLibrary*>::Iterator it;

     for( it = libraries.begin(); it != libraries.end(); ++it ){

       if(it.key()->isOwner(i))

         i->setModuleOwner(it.key());

     }

     items.insert(i, item);

     interfaceItems.insert(item, i);

   }

   else

     item = items[i];

  

   // Update the icons and information 

 #ifdef QWS

@@ -557,34 +556,32 @@ void MainWindowImp::removeProfile(){
 /**

  * A new profile has been selected, change.

  * @param newProfile the new profile.

  */ 

 void MainWindowImp::changeProfile(){

   if(profilesList->currentItem() == -1){

     QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok);

     return;

   }

   QString newProfile = profilesList->text(profilesList->currentItem());

   if(newProfile != currentProfileLabel->text()){

     currentProfileLabel->setText(newProfile);

     QFile::remove(scheme);

     QFile file(scheme);

     if ( file.open(IO_ReadWrite) ) {

       QTextStream stream( &file );

       stream << QString("SCHEME=%1").arg(newProfile);

       file.close();

     }

     // restart all up devices?

     if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){

       // Go through them one by one

       QMap<Interface*, QListViewItem*>::Iterator it;

       for( it = items.begin(); it != items.end(); ++it ){

         if(it.key()->getStatus() == true)

           it.key()->restart();

       }

     }

   }

   // TODO change the profile in the modules

 }

 

-// mainwindowimp.cpp

-

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 49f3eea..c045fe6 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -34,36 +34,34 @@ private slots:
   void informationClicked();

   

   void addProfile();

   void removeProfile();

   void changeProfile();

   

   void updateInterface(Interface *i);

   void newProfileChanged(const QString& newText);

 

 private:

   void loadModules(const QString &path);

   

   Module* loadPlugin(const QString &pluginFileName,

 		     const QString &resolveString = "create_plugin");

 

   // For our local list of names

   QMap<QString, Interface*> interfaceNames;

 

   QMap<Module*, QLibrary*> libraries;

   QMap<Interface*, QListViewItem*> items;

   QMap<QListViewItem*, Interface*> interfaceItems;

   

   QMap<KProcess*, QString> threads;

   QStringList profiles;

 

   bool advancedUserMode;

   QString scheme;

 #ifndef QWS

   KLibLoader *loader;

 #endif

 };

 

-#endif

-

-// mainwindowimp.h

+#endif // MAINWINOWIMP_H