summaryrefslogtreecommitdiffstats
path: root/libtdescreensaver
diff options
context:
space:
mode:
Diffstat (limited to 'libtdescreensaver')
-rw-r--r--libtdescreensaver/main.cpp14
-rw-r--r--libtdescreensaver/tdescreensaver.cpp22
-rw-r--r--libtdescreensaver/tdescreensaver.h6
-rw-r--r--libtdescreensaver/tdescreensaver_vroot.h2
4 files changed, 22 insertions, 22 deletions
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index 2260f25fd..c0d0f3579 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -29,12 +29,12 @@
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
-#include <kcrash.h>
+#include <tdecrash.h>
#include "tdescreensaver.h"
#include "tdescreensaver_vroot.h"
-bool argb_visual = FALSE;
+bool argb_visual = false;
extern "C"
{
@@ -77,23 +77,23 @@ protected:
{
if (e->ascii() == 'q')
{
- kapp->quit();
+ tdeApp->quit();
}
}
virtual void closeEvent( TQCloseEvent * )
{
- kapp->quit();
+ tdeApp->quit();
}
};
//----------------------------------------------------------------------------
-#if defined(Q_WS_QWS) || defined(Q_WS_MACX)
+#if defined(TQ_WS_QWS) || defined(TQ_WS_MACX)
typedef WId Window;
#endif
-KDE_EXPORT int main(int argc, char *argv[])
+TDE_EXPORT int main(int argc, char *argv[])
{
TDELocale::setMainCatalogue("libtdescreensaver");
TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
@@ -131,7 +131,7 @@ KDE_EXPORT int main(int argc, char *argv[])
saveWin = atol(args->getOption("window-id"));
}
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
if (args->isSet("root"))
{
saveWin = RootWindow(tqt_xdisplay(), tqt_xscreen());
diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 30120b164..cb0508eaa 100644
--- a/libtdescreensaver/tdescreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
#include <tdeapplication.h>
#include "tdescreensaver.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <X11/Xlib.h>
#else
typedef WId Window;
@@ -50,13 +50,13 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
XSync(tqt_xdisplay(), false);
d = new KScreenSaverPrivate;
- d->owner = TQT_TQWIDGET(find( id ));
+ d->owner = find( id );
if ( d->owner )
installEventFilter( this );
if ( id )
{
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
XGetGeometry(tqt_xdisplay(), (Drawable)id, &root, &ai, &ai,
&w, &h, &au, &au);
#endif
@@ -80,7 +80,7 @@ KScreenSaver::~KScreenSaver()
void KScreenSaver::embed( TQWidget *w )
{
TDEApplication::sendPostedEvents();
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0);
#endif
w->setGeometry( 0, 0, width(), height() );
@@ -90,7 +90,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 && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
+ if ( d->owner && o == this ) {
TQApplication::sendEvent( d->owner, e );
return false;
}
@@ -122,7 +122,7 @@ KBlankEffect::KBlankEffect( TQObject *parent ) : TQObject( parent )
d->currentEffect = &KBlankEffect::blankNormal;
d->effectProgress = 0;
d->timer = new TQTimer( this );
- connect( d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+ connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
}
@@ -147,7 +147,7 @@ void KBlankEffect::blank( TQWidget *w, Effect effect )
}
if ( effect == Random )
- effect = (Effect)(kapp->random() % MaximumEffects);
+ effect = (Effect)(tdeApp->random() % MaximumEffects);
d->effectProgress = 0;
d->widget = w;
@@ -172,7 +172,7 @@ void KBlankEffect::blankSweepRight()
{
TQPainter p( d->widget );
p.fillRect( d->effectProgress, 0, 50, d->widget->height(), black );
- kapp->flushX();
+ tdeApp->flushX();
d->effectProgress += 50;
if ( d->effectProgress >= d->widget->width() )
finished();
@@ -183,7 +183,7 @@ void KBlankEffect::blankSweepDown()
{
TQPainter p( d->widget );
p.fillRect( 0, d->effectProgress, d->widget->width(), 50, black );
- kapp->flushX();
+ tdeApp->flushX();
d->effectProgress += 50;
if ( d->effectProgress >= d->widget->height() )
finished();
@@ -203,7 +203,7 @@ void KBlankEffect::blankBlocks()
for ( int i = 0; i < bx*by; i++ )
block[i] = i;
for ( int i = 0; i < bx*by; i++ ) {
- int swap = kapp->random()%(bx*by);
+ int swap = tdeApp->random()%(bx*by);
int tmp = block[i];
block[i] = block[swap];
block[swap] = tmp;
@@ -220,7 +220,7 @@ void KBlankEffect::blankBlocks()
d->effectProgress++;
}
- kapp->flushX();
+ tdeApp->flushX();
if ( d->effectProgress >= bx*by ) {
delete[] block;
diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h
index 0dbb0e5d2..e5e3e39f2 100644
--- a/libtdescreensaver/tdescreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
@@ -56,9 +56,9 @@ class KBlankEffectPrivate;
* @short Provides a TQWidget for a screensaver to draw into.
* @author Martin R. Jones <mjones@kde.org>
*/
-class KDE_EXPORT KScreenSaver : public TQWidget
+class TDE_EXPORT KScreenSaver : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
* @param id The winId() of the widget to draw the screensaver into.
@@ -93,7 +93,7 @@ private:
*/
class KBlankEffect : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBlankEffect( TQObject *parent=0 );
~KBlankEffect();
diff --git a/libtdescreensaver/tdescreensaver_vroot.h b/libtdescreensaver/tdescreensaver_vroot.h
index aae76f9d9..adb98c964 100644
--- a/libtdescreensaver/tdescreensaver_vroot.h
+++ b/libtdescreensaver/tdescreensaver_vroot.h
@@ -62,7 +62,7 @@ static const char vroot_rcsid[] = "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolck
#endif
#include <tqwidget.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <X11/X.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 17:13:28 +0000