8 files changed, 11 insertions, 19 deletions
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 1320f25..156f2ac 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -39,10 +38,10 @@
 
 
 DefaultSkin::DefaultSkin() {
-	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+	connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 
 	_widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM);
-	_widget->setFocusPolicy(TQ_NoFocus);
+	_widget->setFocusPolicy(TQWidget::NoFocus);
 
 	KWin::setOnAllDesktops(_widget->winId(), true);
 	KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 2399d83..1e6cc55 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -31,7 +30,7 @@
 class DefaultWidget;
 
 class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		DefaultSkin();
diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h
index 46bd445..6f21917 100644
--- a/kmilo/kmilod/displayskin.h
+++ b/kmilo/kmilod/displayskin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -23,14 +22,14 @@
 #ifndef _DISPLAYSKIN_H_
 #define _DISPLAYSKIN_H_
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqstring.h>
 #include <tqpixmap.h>
 
 namespace KMilo {
 
-class KDE_EXPORT DisplaySkin {
+class TDE_EXPORT DisplaySkin {
 	public:
 		DisplaySkin();
 		virtual ~DisplaySkin();
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 3535ee0..1598bb5 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -43,7 +42,7 @@
 using namespace KMilo;
 
 extern "C" {
-   KDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) {
+   TDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) {
 	   return new KMiloD(name);
    }
 }
@@ -80,7 +79,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100)
 	}
 
 	// Start the timer
-	TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer()));
+	TQObject::connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimer()));
 	if (shouldPoll) {
 		_timer.start(_interval);
 	}
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index d58ea01..58d9fd5 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -35,7 +34,7 @@ namespace KMilo {
 class KMiloInterface;
 
 class KMiloD : public KDEDModule {
-	Q_OBJECT
+	TQ_OBJECT
 //	
 	K_DCOP
 	public:
diff --git a/kmilo/kmilod/kmilointerface.cpp b/kmilo/kmilod/kmilointerface.cpp
index 21a6430..ce1b219 100644
--- a/kmilo/kmilod/kmilointerface.cpp
+++ b/kmilo/kmilod/kmilointerface.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index 4d21185..540b565 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -31,7 +30,7 @@ namespace KMilo {
 
 // FIXME: make put the methods into .cpp file when the header is installed.
 class KMiloInterface : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index e646a7e..771615c 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -28,14 +27,14 @@
 #include <tqpixmap.h>
 #include <tqobject.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
 namespace KMilo {
 class KMiloInterface;
 
-class KDE_EXPORT Monitor : public TQObject {
+class TDE_EXPORT Monitor : public TQObject {
 	public:
 		Monitor(TQObject *parent, const char *name, const TQStringList&);
 		virtual ~Monitor();