summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
Diffstat (limited to 'kio')
-rw-r--r--kio/kfile/kdiroperator.cpp2
-rw-r--r--kio/kio/kfilterdev.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index f84be90ea..753ba1b3a 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -1560,7 +1560,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * )
if (m_fileView)
m_fileView->widget()->resize( size() );
- if ( progress->parent() == this ) // might be reparented into a statusbar
+ if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar
progress->move(2, height() - progress->height() -2);
}
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index 027d1eb4a..e5280542d 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -53,7 +53,10 @@ public:
* Open for reading or writing.
* If the KFilterBase's device is not opened, it will be opened.
*/
+#ifdef qdoc
+#else
virtual bool open( TQ_OpenMode mode );
+#endif
/**
* Close after reading or writing.
* If the KFilterBase's device was opened by open(), it will be closed.
@@ -77,11 +80,14 @@ public:
void setSkipHeaders();
// Not implemented
+#ifdef qdoc
+#else
#ifdef USE_QT4
virtual qint64 size() const;
#else // USE_QT4
virtual TQIODevice::Offset size() const;
#endif // USE_QT4
+#endif
virtual TQIODevice::Offset at() const;
/**
@@ -91,8 +97,11 @@ public:
virtual bool atEnd() const;
+#ifdef qdoc
+#else
virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
+#endif
//int readLine( char *data, uint maxlen );
virtual int getch();
@@ -192,3 +201,4 @@ private:
#endif
+