author | mickeyl <mickeyl> | 2004-04-23 14:43:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-23 14:43:53 (UTC) |
commit | d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6 (patch) (unidiff) | |
tree | 1a069ffb791230709e5be8ce230afb6e8d510af9 | |
parent | 8e32516bbda3fda10314f2afe4ee00eb9a49c013 (diff) | |
download | opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.zip opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.gz opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.bz2 |
disambiguate the API (triggered by gcc 3.4 ;)
-rw-r--r-- | libopie2/opienet/opcap.cpp | 4 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 067d6b7..f8ebe6b 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -1280,16 +1280,14 @@ bool OPacketCapturer::openDumpFile( const QString& filename ) | |||
1280 | _pcd = dump; | 1280 | _pcd = dump; |
1281 | 1281 | ||
1282 | return true; | 1282 | return true; |
1283 | } | 1283 | } |
1284 | 1284 | ||
1285 | 1285 | ||
1286 | bool OPacketCapturer::open( const QFile& file ) | 1286 | bool OPacketCapturer::openCaptureFile( const QString& name ) |
1287 | { | 1287 | { |
1288 | QString name = file.name(); | ||
1289 | |||
1290 | if ( _open ) | 1288 | if ( _open ) |
1291 | { | 1289 | { |
1292 | close(); | 1290 | close(); |
1293 | if ( name == _name ) // ignore opening an already openend device | 1291 | if ( name == _name ) // ignore opening an already openend device |
1294 | { | 1292 | { |
1295 | return true; | 1293 | return true; |
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index 2dbe030..9e718d5 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h | |||
@@ -660,15 +660,15 @@ class OPacketCapturer : public QObject | |||
660 | OPacket* next( int time ); | 660 | OPacket* next( int time ); |
661 | /** | 661 | /** |
662 | * Open the packet capturer to capture packets in live-mode from @a interface. | 662 | * Open the packet capturer to capture packets in live-mode from @a interface. |
663 | */ | 663 | */ |
664 | bool open( const QString& interface ); | 664 | bool open( const QString& interface ); |
665 | /** | 665 | /** |
666 | * Open the packet capturer to capture packets in offline-mode from @a file. | 666 | * Open the packet capturer to capture packets in offline-mode from @a filename. |
667 | */ | 667 | */ |
668 | bool open( const QFile& file ); | 668 | bool openCaptureFile( const QString& filename ); |
669 | /** | 669 | /** |
670 | * Open a prerecorded tcpdump compatible capture file for use with @ref dump() | 670 | * Open a prerecorded tcpdump compatible capture file for use with @ref dump() |
671 | */ | 671 | */ |
672 | bool openDumpFile( const QString& filename ); | 672 | bool openDumpFile( const QString& filename ); |
673 | /** | 673 | /** |
674 | * @returns true if the packet capturer is open | 674 | * @returns true if the packet capturer is open |