Merge from BRANCH_1_0

1 files changed, 25 insertions, 14 deletions

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index db74394..f7d8046 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -18,7 +18,7 @@ class Module : QObject{
 signals:
   void updateInterface(Interface *i);
 
-	
+
 public:
   Module(){};
 
@@ -32,14 +32,14 @@ public:
    * The current profile has been changed and the module should do any
    * neccesary changes also.
    * @param newProfile what the profile should be changed to.
-   */ 
+   */
   virtual void setProfile(const QString &newProfile) = 0;
-  
+
   /**
    * get the icon name for this device.
    * @param Interface* can be used in determining the icon.
-   * @return QString the icon name (minus .png, .gif etc) 
-   */ 
+   * @return QString the icon name (minus .png, .gif etc)
+   */
   virtual QString getPixmapName(Interface *) = 0;
 
   /**
@@ -48,41 +48,41 @@ public:
    * @return bool true if i is owned by this module, false otherwise.
    */
   virtual bool isOwner(Interface *){ return false; };
-  
+
   /**
    * Create and return the WLANConfigure Module
    * @param Interface *i the interface to configure.
    * @return QWidget* pointer to this modules configure.
    */
   virtual QWidget *configure(Interface *){ return NULL; } ;
-  
+
   /**
    * Create, and return the Information Module
    * @param Interface *i the interface to get info on.
    * @return QWidget* pointer to this modules info.
    */
   virtual QWidget *information(Interface *){ return NULL; };
-  
+
   /**
    * Get all active (up or down) interfaces
    * @return QList<Interface> A list of interfaces that exsist that havn't
    * been called by isOwner()
-   */  
+   */
   virtual QList<Interface> getInterfaces() = 0;
-  
+
   /**
    * Adds possible new interfaces to the list (Example: usb(ppp), ir(ppp),
    *  modem ppp)
    */
   virtual void possibleNewInterfaces(QMap<QString, QString> &list) = 0;
-  
+
   /**
    * Attempts to create a new interface from name
    * @return Interface* NULL if it was unable to be created.
    * @param name the type of interface to create
-   */  
+   */
   virtual Interface *addNewInterface(const QString &name) = 0;
-  
+
   /**
    * Attempts to remove the interface, doesn't delete i
    * @return bool true if successfull, false otherwise.
@@ -90,10 +90,21 @@ public:
   virtual bool remove(Interface* i) = 0;
 
   /**
-   * get dcop calls 
+   * get dcop calls
    */
   virtual void receive(const QCString &msg, const QByteArray &arg) = 0;
 
+    QStringList handledInterfaceNames()const { return m_inter; }
+protected:
+    /**
+     * set which interfaceNames should not be shown cause they're handled
+     * internally of this module.. An already running ppp link or
+     * a tunnel...
+     */
+    void setHandledInterfaceNames( const QStringList& in) { m_inter = in; }
+
+private:
+    QStringList m_inter;
 };
 
 #endif