Fix recursive repaint

Add Qt4 support to kwin


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1217377 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent b6fc43ccd5
commit 107dd1f983

@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert)
{ {
m_outputBuffer.close(); m_outputBuffer.close();
data(m_outputBuffer.buffer()); data(m_outputBuffer.buffer());
m_outputBuffer.setBuffer(TQByteArray()); m_outputBuffer.tqsetBufferFromCopy(TQByteArray());
m_outputBuffer.open(IO_WriteOnly); m_outputBuffer.open(IO_WriteOnly);
} }
} }
@ -505,7 +505,7 @@ void MANProtocol::get(const KURL& url )
m_outputBuffer.close(); m_outputBuffer.close();
data(m_outputBuffer.buffer()); data(m_outputBuffer.buffer());
m_outputBuffer.setBuffer(TQByteArray()); m_outputBuffer.tqsetBufferFromCopy(TQByteArray());
// tell we are done // tell we are done
data(TQByteArray()); data(TQByteArray());
} }

@ -460,7 +460,8 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
void void
KonqFrame::paintEvent( TQPaintEvent* ) KonqFrame::paintEvent( TQPaintEvent* )
{ {
m_pStatusBar->tqrepaint(); // m_pStatusBar->tqrepaint();
m_pStatusBar->update();
} }
void KonqFrame::slotRemoveView() void KonqFrame::slotRemoveView()

@ -580,7 +580,7 @@ class Client : public TQObject, public KDecorationDefines
friend struct CheckIgnoreFocusStealingProcedure; friend struct CheckIgnoreFocusStealingProcedure;
friend struct ResetupRulesProcedure; friend struct ResetupRulesProcedure;
friend class GeometryUpdatesPostponer; 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 ); } void hide() { assert( false ); }
uint opacity_; uint opacity_;
uint savedOpacity_; uint savedOpacity_;

@ -32,6 +32,16 @@ License. See the file "COPYING" for the exact licensing terms.
#include "atoms.h" #include "atoms.h"
#include "notifications.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; extern Time qt_x_time;
#endif #endif
@ -271,7 +281,7 @@ void updateXTime()
XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL ); XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL );
} }
assert( next_x_time != CurrentTime ); 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 XEvent ev; // remove the PropertyNotify event from the events queue
XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev ); XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev );
} }

Loading…
Cancel
Save