4 files changed, 9 insertions, 18 deletions
diff --git a/kview/kimageviewer/canvas.cpp b/kview/kimageviewer/canvas.cpp
index 9b2c987b..98174503 100644
--- a/kview/kimageviewer/canvas.cpp
+++ b/kview/kimageviewer/canvas.cpp
@@ -31,5 +31,3 @@ namespace KImageViewer
 	{
 	}
 } //namespace
-
-// vim: sw=4 ts=4
diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h
index 2495f372..21dfc23e 100644
--- a/kview/kimageviewer/canvas.h
+++ b/kview/kimageviewer/canvas.h
@@ -29,8 +29,8 @@ class TQPoint;
 class TQWidget;
 
 #include <tqstring.h>
-#include <tqobjdefs.h>
-#include <kdemacros.h>
+#include <tqobjectdefs.h>
+#include <tdemacros.h>
 namespace KImageViewer
 {
 
@@ -52,11 +52,11 @@ namespace KImageViewer
    if( ! ( widget && m_canvas ) )
    {
      KMessageBox::error( this, "Could not find the Canvas!" );
-     kapp->quit();
+     tdeApp->quit();
    }
    setCentralWidget( widget );
-   connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) );
-   connect( m_canvas->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) );
+   connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) );
+   connect( m_canvas->widget(), TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) );
    </pre>
  *
  * You can't connect signals or slots using KImageViewer::Canvas, because this interface
@@ -67,7 +67,7 @@ namespace KImageViewer
  * until it's finished. So if you're using this interface please get in contact
  * with me.
  */
-class KDE_EXPORT Canvas
+class TDE_EXPORT Canvas
 {
 	public:
 		/**
@@ -342,7 +342,4 @@ class KDE_EXPORT Canvas
 
 }; //class Canvas
 } //namespace KImageViewer
-
-// vim:sw=4:ts=4
-
 #endif // KIMAGEVIEWER_CANVAS_H
diff --git a/kview/kimageviewer/viewer.cpp b/kview/kimageviewer/viewer.cpp
index 1a5890d6..4f3771b8 100644
--- a/kview/kimageviewer/viewer.cpp
+++ b/kview/kimageviewer/viewer.cpp
@@ -33,4 +33,3 @@ namespace KImageViewer
 } //namespace
 
 #include "viewer.moc"
-// vim: sw=4 ts=4
diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h
index 790a102c..87286fb7 100644
--- a/kview/kimageviewer/viewer.h
+++ b/kview/kimageviewer/viewer.h
@@ -22,7 +22,7 @@
 #define KIMAGEVIEWER_VIEWER_H
 
 #include <tdeparts/part.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 namespace KParts
 {
 	class BrowserExtension;
@@ -45,9 +45,9 @@ namespace KImageViewer
  * until it's finished. So if you're using this interface please get in contact
  * with me.
  */
-class KDE_EXPORT Viewer : public KParts::ReadWritePart
+class TDE_EXPORT Viewer : public KParts::ReadWritePart
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		Viewer( TQObject * parent = 0, const char * name = 0 );
@@ -94,7 +94,4 @@ class KDE_EXPORT Viewer : public KParts::ReadWritePart
 
 }; //class Viewer
 } //namespace KImageViewer
-
-// vim:sw=4:ts=4
-
 #endif // KIMAGEVIEWER_VIEWER_H