summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-05 02:28:57 (UTC)
committer wimpie <wimpie>2005-01-05 02:28:57 (UTC)
commit2f343aab63dd30e97a893e3691501cdd55114e82 (patch) (side-by-side diff)
tree819ec07fa02e9a422a9ba834663b18bc34bbb208
parent46a75181b493c25304f06cbd9f757f4165ac2b5e (diff)
downloadopie-2f343aab63dd30e97a893e3691501cdd55114e82.zip
opie-2f343aab63dd30e97a893e3691501cdd55114e82.tar.gz
opie-2f343aab63dd30e97a893e3691501cdd55114e82.tar.bz2
Networksettings2 also uses ledboxes -> hence added namespaces
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/networksettings.cpp6
-rw-r--r--noncore/settings/networksettings2/networksettings.h13
2 files changed, 14 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index a0d4c7c..dca6631 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -31,37 +31,37 @@ NetworkSettings::NetworkSettings( QWidget *parent,
UpdateTimer = new QTimer( this );
// set pixmaps
Add_TB->setPixmap( NSResources->getPixmap( "add" ) );
Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) );
CheckState_TB->setPixmap( NSResources->getPixmap( "check" ) );
GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) );
Disable_TB->setPixmap( NSResources->getPixmap( "disabled" ) );
Up_TB->setPixmap( NSResources->getPixmap( "more" ) );
Down_TB->setPixmap( NSResources->getPixmap( "less" ) );
QVBoxLayout* V = new QVBoxLayout( LED_Frm );
QHBoxLayout * H = new QHBoxLayout( 0 );
V->addStretch(1);
V->addLayout( H );
- Leds[0] = new OLedBox( red, LED_Frm );
+ Leds[0] = new Opie::Ui::OLedBox( red, LED_Frm );
H->addWidget( Leds[0], 0, Qt::AlignVCenter );
- Leds[1] = new OLedBox( red, LED_Frm );
+ Leds[1] = new Opie::Ui::OLedBox( red, LED_Frm );
H->addWidget( Leds[1], 0, Qt::AlignVCenter );
- Leds[2] = new OLedBox( red, LED_Frm );
+ Leds[2] = new Opie::Ui::OLedBox( red, LED_Frm );
H->addWidget( Leds[2], 0, Qt::AlignVCenter );
V->addStretch(1);
SLOT_ToProfile();
// populate main Listbox
Profiles_LB->clear();
QPEApplication::setStylusOperation(
Profiles_LB->viewport(), QPEApplication::RightOnHold );
connect( Profiles_LB,
SIGNAL(rightButtonPressed(QListBoxItem*,const QPoint&)),
this, SLOT(SLOT_EditNode(QListBoxItem*)) );
{ Name2Connection_t & M = NSResources->connections();
diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h
index 987e311..e1c2b80 100644
--- a/noncore/settings/networksettings2/networksettings.h
+++ b/noncore/settings/networksettings2/networksettings.h
@@ -1,26 +1,35 @@
#include "nsdata.h"
#include "networksettingsGUI.h"
#include "resources.h"
class ANetNode;
class ANetNodeInstance;
class QTimer;
class QListBoxItem;
class QEvent;
-class OLedBox;
+
+namespace Opie {
+
+ namespace Ui {
+
+ class OLedBox;
+
+ };
+
+};
class NetworkSettings : public NetworkSettingsGUI {
Q_OBJECT
public :
NetworkSettings( QWidget *parent=0,
const char *name=0,
WFlags fl = 0 );
virtual ~NetworkSettings( void );
static QString appName( void )
{ return QString::fromLatin1("networksettings"); }
public slots :
@@ -42,18 +51,18 @@ public slots :
void SLOT_ToMessages( void );
void SLOT_CmdMessage( const QString & S );
private :
void updateProfileState( QListBoxItem * it );
QTimer * UpdateTimer;
NetworkSettingsData NSD;
/*
no leds : not present, unknown, unchecked or disabled
(1) down : hardware present but inactive
(2) available : hardware present and active
(3) up : present active and connected
*/
- OLedBox * Leds[3];
+ Opie::Ui::OLedBox * Leds[3];
};