diff options
| -rw-r--r-- | kioslave/man/kio_man.cpp | 4 | ||||
| -rw-r--r-- | konqueror/konq_frame.cc | 3 | ||||
| -rw-r--r-- | kwin/client.h | 2 | ||||
| -rw-r--r-- | kwin/utils.cpp | 12 |
4 files changed, 16 insertions, 5 deletions
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 95504bcf4..eec7b965d 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.setBuffer(TQByteArray()); + m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); m_outputBuffer.open(IO_WriteOnly); } } @@ -505,7 +505,7 @@ void MANProtocol::get(const KURL& url ) m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.setBuffer(TQByteArray()); + m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); // tell we are done data(TQByteArray()); } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index cda99b291..965fcec06 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -460,7 +460,8 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) void KonqFrame::paintEvent( TQPaintEvent* ) { - m_pStatusBar->tqrepaint(); +// m_pStatusBar->tqrepaint(); + m_pStatusBar->update(); } void KonqFrame::slotRemoveView() diff --git a/kwin/client.h b/kwin/client.h index 52fb025f6..d715a8558 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -580,7 +580,7 @@ class Client : public TQObject, public KDecorationDefines friend struct CheckIgnoreFocusStealingProcedure; friend struct ResetupRulesProcedure; friend class GeometryUpdatesPostponer; - void show() { assert( false ); } // SELI remove after Client is no longer QWidget + void show() { assert( false ); } // SELI remove after Client is no longer TQWidget void hide() { assert( false ); } uint opacity_; uint savedOpacity_; diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 67c3aa1c9..5a8d5ad3c 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -32,6 +32,16 @@ License. See the file "COPYING" for the exact licensing terms. #include "atoms.h" #include "notifications.h" +#ifdef USE_QT4 +#include <Qt/qx11info_x11.h> +#endif // USE_QT4 + +#ifdef USE_QT4 +#define SET_X_TIME(x) QX11Info::setAppTime(x) +#else // USE_QT4 +#define SET_X_TIME(x) qt_x_time = x +#endif // USE_QT4 + extern Time qt_x_time; #endif @@ -271,7 +281,7 @@ void updateXTime() XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL ); } assert( next_x_time != CurrentTime ); - qt_x_time = next_x_time; + SET_X_TIME(next_x_time); XEvent ev; // remove the PropertyNotify event from the events queue XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev ); } |