diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /libkscreensaver | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkscreensaver')
| -rw-r--r-- | libkscreensaver/kscreensaver.cpp | 4 | ||||
| -rw-r--r-- | libkscreensaver/kscreensaver.h | 4 | ||||
| -rw-r--r-- | libkscreensaver/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp index a35b2545d..92aa8f931 100644 --- a/libkscreensaver/kscreensaver.cpp +++ b/libkscreensaver/kscreensaver.cpp @@ -48,7 +48,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() unsigned int h = 0; d = new KScreenSaverPrivate; - d->owner = find( id ); + d->owner = TQT_TQWIDGET(find( id )); if ( d->owner ) installEventFilter( this ); @@ -88,7 +88,7 @@ void KScreenSaver::embed( TQWidget *w ) bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) { // make sure events get to the original window owner - if ( d->owner && o == this ) { + if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { TQApplication::sendEvent( d->owner, e ); return false; } diff --git a/libkscreensaver/kscreensaver.h b/libkscreensaver/kscreensaver.h index fd2068359..2879172ac 100644 --- a/libkscreensaver/kscreensaver.h +++ b/libkscreensaver/kscreensaver.h @@ -56,7 +56,7 @@ class KBlankEffectPrivate; * @short Provides a TQWidget for a screensaver to draw into. * @author Martin R. Jones <mjones@kde.org> */ -class KDE_EXPORT KScreenSaver : public QWidget +class KDE_EXPORT KScreenSaver : public TQWidget { Q_OBJECT public: @@ -91,7 +91,7 @@ private: * @short Blanks a widget using various effects. * @author Martin R. Jones <mjones@kde.org> */ -class KBlankEffect : public QObject +class KBlankEffect : public TQObject { Q_OBJECT public: diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index 50e2fb8d7..e80dd6bff 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -62,7 +62,7 @@ static void crashHandler( int ) //---------------------------------------------------------------------------- -class DemoWindow : public QWidget +class DemoWindow : public TQWidget { public: DemoWindow() : TQWidget() |