summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-09 19:24:37 (UTC)
committer mickeyl <mickeyl>2003-12-09 19:24:37 (UTC)
commit04d6caa37743a1957b9ffa061a58a71a3909ea3d (patch) (unidiff)
tree04a692f57263d0573f2b2c704e4a6e1057aa7d40
parent1642df2b072858b5eec9ad007a23475cc5270bfe (diff)
downloadopie-04d6caa37743a1957b9ffa061a58a71a3909ea3d.zip
opie-04d6caa37743a1957b9ffa061a58a71a3909ea3d.tar.gz
opie-04d6caa37743a1957b9ffa061a58a71a3909ea3d.tar.bz2
preload the manufacturer library during startup (nice trick, btw.)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
2 files changed, 14 insertions, 0 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 365efb0..1d4a98b 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -33,30 +33,32 @@
33using namespace Opie; 33using namespace Opie;
34#endif 34#endif
35 35
36#ifdef QWS 36#ifdef QWS
37#include <opie2/oapplication.h> 37#include <opie2/oapplication.h>
38#else 38#else
39#include <qapplication.h> 39#include <qapplication.h>
40#endif 40#endif
41#include <opie2/omanufacturerdb.h>
41#include <opie2/onetwork.h> 42#include <opie2/onetwork.h>
42#include <opie2/opcap.h> 43#include <opie2/opcap.h>
43 44
44// Qt 45// Qt
45 46
46#include <qcheckbox.h> 47#include <qcheckbox.h>
47#include <qcombobox.h> 48#include <qcombobox.h>
48#include <qdatetime.h> 49#include <qdatetime.h>
49#include <qpushbutton.h> 50#include <qpushbutton.h>
50#include <qlineedit.h> 51#include <qlineedit.h>
51#include <qmessagebox.h> 52#include <qmessagebox.h>
52#include <qobjectlist.h> 53#include <qobjectlist.h>
53#include <qregexp.h> 54#include <qregexp.h>
54#include <qspinbox.h> 55#include <qspinbox.h>
56#include <qtimer.h>
55#include <qtoolbutton.h> 57#include <qtoolbutton.h>
56#include <qmainwindow.h> 58#include <qmainwindow.h>
57 59
58// Standard 60// Standard
59 61
60#include <assert.h> 62#include <assert.h>
61#include <errno.h> 63#include <errno.h>
62#include <unistd.h> 64#include <unistd.h>
@@ -83,25 +85,35 @@ Wellenreiter::Wellenreiter( QWidget* parent )
83 #endif 85 #endif
84 86
85 netview->setColumnWidthMode( 1, QListView::Manual ); 87 netview->setColumnWidthMode( 1, QListView::Manual );
86 connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), 88 connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
87 this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); 89 this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
88 pcap = new OPacketCapturer(); 90 pcap = new OPacketCapturer();
89 91
90 gps = new GPS( this ); 92 gps = new GPS( this );
93
94 QTimer::singleShot( 1000, this, SLOT( initialTimer() ) );
95
91} 96}
92 97
93 98
94Wellenreiter::~Wellenreiter() 99Wellenreiter::~Wellenreiter()
95{ 100{
96 delete pcap; 101 delete pcap;
97} 102}
98 103
99 104
105void Wellenreiter::initialTimer()
106{
107 qDebug( "Wellenreiter::preloading manufacturer database..." );
108 OManufacturerDB::instance();
109}
110
111
100void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) 112void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
101{ 113{
102 configwindow = cw; 114 configwindow = cw;
103} 115}
104 116
105 117
106void Wellenreiter::channelHopped(int c) 118void Wellenreiter::channelHopped(int c)
107{ 119{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 25a5e8d..d882500 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -54,16 +54,18 @@ class Wellenreiter : public WellenreiterBase {
54 54
55 public: 55 public:
56 bool sniffing; 56 bool sniffing;
57 57
58 protected: 58 protected:
59 virtual void timerEvent( QTimerEvent* ); 59 virtual void timerEvent( QTimerEvent* );
60 60
61 public slots: 61 public slots:
62 void initialTimer();
63
62 void channelHopped(int); 64 void channelHopped(int);
63 void receivePacket(OPacket*); 65 void receivePacket(OPacket*);
64 void startClicked(); 66 void startClicked();
65 void stopClicked(); 67 void stopClicked();
66 68
67 void joinNetwork(const QString&,const QString&,int,const QString&); 69 void joinNetwork(const QString&,const QString&,int,const QString&);
68 70
69 signals: 71 signals: