author | wimpie <wimpie> | 2005-01-06 23:52:47 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-06 23:52:47 (UTC) |
commit | a8e5ecd107a79f940d8a99d4a77071606a3a932f (patch) (side-by-side diff) | |
tree | 3b2603d07877fb05fc5f2a0dbbbcf3ad1cce74c3 /noncore/settings/networksettings2 | |
parent | a056b6d067800486d9c1ce99d1b923289d335e8f (diff) | |
download | opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.zip opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.tar.gz opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.tar.bz2 |
Some namespace } -> };
added NS2SetMac.sh script in control file
added activate/disactivate for usb
renamed templates directory to NS2templates
Diffstat (limited to 'noncore/settings/networksettings2') (more/less context) (ignore whitespace changes)
13 files changed, 25 insertions, 25 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 8487e3e..973b4b7 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp @@ -40,17 +40,13 @@ using namespace Opietooth2; int main( int argc, char * argv[] ) { int rv = 0; int Action = ACT_GUI; // could be overruled by -qws QApplication::Type GuiType = QApplication::GuiClient; -#ifdef _WS_QWS_ QPEApplication * TheApp; -#else - QApplication * TheApp; -#endif for ( int i = 1; i < argc; i ++ ) { int rmv; rmv = 0; if( strcmp( argv[i], "--regen" ) == 0 ) { Action = ACT_REGEN; @@ -81,24 +77,20 @@ int main( int argc, char * argv[] ) { Log(("Request : %s\n", argv[1] )); } else if( strstr( argv[0], "-opietooth" ) ) { Action = ACT_OT; } // Start Qt -#ifdef _WS_QWS_ // because QPEApplication does not handle GuiType well if( GuiType == QApplication::Tty ) { // this cast is NOT correct but we do not use // TheApp anymore ... TheApp = (QPEApplication *)new QApplication( argc, argv, GuiType ); } else { TheApp = new QPEApplication( argc, argv, GuiType ); } -#else - TheApp = new QApplication( argc, argv, GuiType ); -#endif // init qt with app widget switch( Action ) { case ACT_REQUEST : { NetworkSettingsData NS; @@ -148,17 +140,13 @@ int main( int argc, char * argv[] ) { } else { W = new NetworkSettings(0); } TheApp->setMainWidget( W ); W->show(); -#ifdef _WS_QWS_ W->showMaximized(); -#else - W->resize( W->sizeHint() ); -#endif rv = TheApp->exec(); delete W; } break; } diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp index 82fd43a..8deef94 100644 --- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp +++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp @@ -5,13 +5,13 @@ #include <qfile.h> #include <qtextstream.h> #include "resources.h" #include "systemfile.h" -#define TEMPLATEDIR "networktemplates/" +#define TEMPLATEDIR "NS2templates/" QString TemplDir; SystemFile::SystemFile( const QString & N, const QString & P, bool KDI ){ Name = N; diff --git a/noncore/settings/networksettings2/opie-networksettings2.control b/noncore/settings/networksettings2/opie-networksettings2.control index 874833c..a79a740 100644 --- a/noncore/settings/networksettings2/opie-networksettings2.control +++ b/noncore/settings/networksettings2/opie-networksettings2.control @@ -1,8 +1,8 @@ Package: opie-networksettings2 -Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* +Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* bin/NS2SetMac.sh Priority: optional Section: opie/settings Maintainer: wim delvaux <wimpie@handhelds.org> Architecture: arm Depends: task-opie-minimal, libopietooth2 Description: Network settings. diff --git a/noncore/settings/networksettings2/opietooth2/OTDevice.h b/noncore/settings/networksettings2/opietooth2/OTDevice.h index c2abb09..cf1c4b6 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDevice.h +++ b/noncore/settings/networksettings2/opietooth2/OTDevice.h @@ -13,14 +13,14 @@ class QTimerEvent; namespace Opie { namespace Core { class OProcess; - } -} + }; +}; namespace Opietooth2 { /** * Device takes care of attaching serial * devices to the blueZ stack. diff --git a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h index 8395f37..50f28fc 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h +++ b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h @@ -100,9 +100,9 @@ protected: bdaddr_t BDaddr; bool IsValid; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h index b54ffdf..f249cf7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.h +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h @@ -225,8 +225,8 @@ private: OTHCISocket * Socket; // backpointer to opietooth system OTGateway * OT; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTIcons.h b/noncore/settings/networksettings2/opietooth2/OTIcons.h index ee10831..966ed24 100644 --- a/noncore/settings/networksettings2/opietooth2/OTIcons.h +++ b/noncore/settings/networksettings2/opietooth2/OTIcons.h @@ -46,9 +46,9 @@ private: QMap<QString,QString> deviceIcons; QMap<int,QString> serviceIcons; UUIDVector Modems; UUIDVector Networks; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h index f7bdeec..2682499 100644 --- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h +++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h @@ -171,8 +171,8 @@ private slots: void slotInquiryTimeout(); void slotHCIEvent(unsigned char eventCode, QByteArray buf); }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTPeer.h b/noncore/settings/networksettings2/opietooth2/OTPeer.h index c09af15..9cd0dc7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTPeer.h +++ b/noncore/settings/networksettings2/opietooth2/OTPeer.h @@ -127,9 +127,9 @@ private: int ProbeFD; int ProbePhase; // see OTDriver long ProbeTimeout; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h index e79e33d..86b5623 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h @@ -132,9 +132,9 @@ private: QString * stringVal; // strings and urls AttributeVector * sequenceVal; // sequences and alternatives } Value; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPService.h b/noncore/settings/networksettings2/opietooth2/OTSDPService.h index 4831df0..21d7344 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPService.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPService.h @@ -67,9 +67,9 @@ private: OTSDPAttribute * attr; }; QArray<AttributeEntry> attributeList; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTUUID.h b/noncore/settings/networksettings2/opietooth2/OTUUID.h index aebd9b9..97df114 100644 --- a/noncore/settings/networksettings2/opietooth2/OTUUID.h +++ b/noncore/settings/networksettings2/opietooth2/OTUUID.h @@ -51,8 +51,8 @@ public : bool operator<( const OTUUID & other ) const; bool operator==(const OTUUID & uuid) const; uint64_t hi; uint64_t lo; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp index f8824e0..0a46642 100644 --- a/noncore/settings/networksettings2/usb/usbrun.cpp +++ b/noncore/settings/networksettings2/usb/usbrun.cpp @@ -68,13 +68,25 @@ State_t USBRun::detectState( void ) { } } return Unavailable; } -QString USBRun::setMyState( NodeCollection *, Action_t , bool ) { +QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) { + + // nothing needs to be done to 'activate' or 'deactivate' + // a cable + + // perhaps (later) we can figure out if the device is IN the + // cradle + if( A == Activate ) { + NC->setCurrentState( Available ); + } else if ( A == Deactivate ) { + NC->setCurrentState( Unavailable ); + } + return QString(); } // get interface that is free or assigned to us InterfaceInfo * USBRun::getInterface( void ) { |