9 files changed, 13 insertions, 43 deletions
diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl
index f23e5e80..455fd3e3 100644
--- a/kjsembed/tools/doxygen2cons_cpp.xsl
+++ b/kjsembed/tools/doxygen2cons_cpp.xsl
@@ -90,10 +90,5 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::<xsl:value-of select="$cons_na
 </xsl:for-each>
 
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
 </xsl:template>
 </xsl:stylesheet>
diff --git a/kjsembed/tools/doxygen2cons_h.xsl b/kjsembed/tools/doxygen2cons_h.xsl
index 8140d52e..fa13f5e3 100644
--- a/kjsembed/tools/doxygen2cons_h.xsl
+++ b/kjsembed/tools/doxygen2cons_h.xsl
@@ -70,10 +70,5 @@ private:
 } // namespace KJSEmbed
 
 #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
 </xsl:template>
 </xsl:stylesheet>
diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl
index a2be08d4..46586512 100644
--- a/kjsembed/tools/doxygen2imp_cpp.xsl
+++ b/kjsembed/tools/doxygen2imp_cpp.xsl
@@ -290,10 +290,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object
 </xsl:for-each>
 
 } // namespace KJSEmbed
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
 </xsl:template>
 </xsl:stylesheet>
diff --git a/kjsembed/tools/doxygen2imp_h.xsl b/kjsembed/tools/doxygen2imp_h.xsl
index ce00e7a1..5b901c15 100644
--- a/kjsembed/tools/doxygen2imp_h.xsl
+++ b/kjsembed/tools/doxygen2imp_h.xsl
@@ -77,10 +77,5 @@ private:
 } // namespace KJSEmbed
 
 #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H
-
-// Local Variables:
-// c-basic-offset: 4
-// End:
-
 </xsl:template>
 </xsl:stylesheet>
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 6fc18ccf..5c5fb034 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -44,7 +44,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQBrush: public Qt
+class TQ_EXPORT TQBrush: public Qt
 {
 friend class TQPainter;
 public:
@@ -84,8 +84,8 @@ private:
  *****************************************************************************/
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
 #endif
 
 #endif // TQBRUSH_H
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bbd97489..dbdd6548 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_CANVAS
 #define TQM_TEMPLATE_EXTERN_CANVAS
 #else
-#define TQM_EXPORT_CANVAS Q_EXPORT
+#define TQM_EXPORT_CANVAS TQ_EXPORT
 #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
 #endif
 
@@ -133,16 +133,6 @@ public:
     virtual void setActive(bool yes);
     bool isActive() const
 	{ return (bool)act; }
-#ifndef TQT_NO_COMPAT
-    bool visible() const
-	{ return (bool)vis; }
-    bool selected() const
-	{ return (bool)sel; }
-    bool enabled() const
-	{ return (bool)ena; }
-    bool active() const
-	{ return (bool)act; }
-#endif
 
     enum RttiValues {
 	Rtti_Item = 0,
@@ -208,7 +198,7 @@ class TQCanvasData;
 
 class TQM_EXPORT_CANVAS TQCanvas : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQCanvas( TQObject* parent = 0, const char* name = 0 );
     TQCanvas(int w, int h);
@@ -354,7 +344,7 @@ class TQCanvasViewData;
 
 class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 7fda3222..88c42ce3 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -52,7 +52,7 @@ class TQStringList;
 template <class T> class TQDeepCopy;
 
 
-class Q_EXPORT TQDir
+class TQ_EXPORT TQDir
 {
 public:
     enum FilterSpec { Dirs	    = 0x001,
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 40e9767e..17fc002c 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -44,7 +44,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQPen: public Qt
+class TQ_EXPORT TQPen: public Qt
 {
 public:
     TQPen();
@@ -72,7 +72,7 @@ public:
 
 private:
     friend class TQPainter;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     friend class TQFontEngineWin;
 #endif
 
@@ -92,8 +92,8 @@ private:
   TQPen stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
 #endif
 
 #endif // TQPEN_H
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index 1f7115f2..b1ce519e 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -43,9 +43,9 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQTimer : public TQObject
+class TQ_EXPORT TQTimer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTimer( TQObject *parent=0, const char *name=0 );
    ~TQTimer();