summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2004-04-23 14:43:53 (UTC)
committer mickeyl <mickeyl>2004-04-23 14:43:53 (UTC)
commitd8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6 (patch) (side-by-side diff)
tree1a069ffb791230709e5be8ce230afb6e8d510af9 /libopie2
parent8e32516bbda3fda10314f2afe4ee00eb9a49c013 (diff)
downloadopie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.zip
opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.gz
opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.bz2
disambiguate the API (triggered by gcc 3.4 ;)
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/opcap.cpp4
-rw-r--r--libopie2/opienet/opcap.h4
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 )
_pcd = dump;
return true;
}
-bool OPacketCapturer::open( const QFile& file )
+bool OPacketCapturer::openCaptureFile( const QString& name )
{
- QString name = file.name();
-
if ( _open )
{
close();
if ( name == _name ) // ignore opening an already openend device
{
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
OPacket* next( int time );
/**
* Open the packet capturer to capture packets in live-mode from @a interface.
*/
bool open( const QString& interface );
/**
- * Open the packet capturer to capture packets in offline-mode from @a file.
+ * Open the packet capturer to capture packets in offline-mode from @a filename.
*/
- bool open( const QFile& file );
+ bool openCaptureFile( const QString& filename );
/**
* Open a prerecorded tcpdump compatible capture file for use with @ref dump()
*/
bool openDumpFile( const QString& filename );
/**
* @returns true if the packet capturer is open