diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-27 19:26:26 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-27 19:26:26 +0000 |
| commit | 2fa036d5898ffd3dee5f4c396b09c7d904c49b5e (patch) | |
| tree | 61105eaaae5fb7bc23dd0f4e51e5a28fb722603a /kio | |
| parent | da24d1f16d7461aec72b5a8f3a797acf73d7e6fd (diff) | |
| download | tdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.tar.gz tdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.zip | |
Aviod conflicts with Qt4 namespace members
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217530 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio')
| -rw-r--r-- | kio/kio/kfilterdev.cpp | 4 | ||||
| -rw-r--r-- | kio/kio/kfilterdev.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp index c1f4d7953..f6af06ae2 100644 --- a/kio/kio/kfilterdev.cpp +++ b/kio/kio/kfilterdev.cpp @@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype return 0; } -bool KFilterDev::open( int mode ) +bool KFilterDev::open( OpenMode mode ) { //kdDebug(7005) << "KFilterDev::open " << mode << endl; if ( mode == IO_ReadOnly ) @@ -132,7 +132,7 @@ bool KFilterDev::open( int mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQIODevice_OpenModeFlag)mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (OpenMode)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index edd180ad8..cf730636a 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -53,7 +53,7 @@ public: * Open for reading or writing. * If the KFilterBase's device is not opened, it will be opened. */ - virtual bool open( int mode ); + virtual bool open( OpenMode mode ); /** * Close after reading or writing. * If the KFilterBase's device was opened by open(), it will be closed. |