13 files changed, 23 insertions, 30 deletions
diff --git a/kspy/Makefile.am b/kspy/Makefile.am
index b1e6cff6..59aaf9fb 100644
--- a/kspy/Makefile.am
+++ b/kspy/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = 	main.cpp spy.cpp spy.h navview.cpp navview.h propsview.cpp \
 METASOURCES = AUTO
 
 messages: 
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/spy.pot; \
 	fi
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index b5e34731..e320ab78 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -45,7 +45,7 @@ void ClassInfoView::buildList( TQObject *o )
 
   for (int index = 0; index < mo->numClassInfo(true); index++) {
     const TQClassInfo * classInfo = mo->classInfo(index, true);
-    new TDEListViewItem( this, classInfo->tqt_mo_ci_name, classInfo->tqt_mo_ci_value );
+    new TDEListViewItem( this, classInfo->name, classInfo->value );
   }
 }
 
diff --git a/kspy/classinfoview.h b/kspy/classinfoview.h
index 71f4d5ba..5a440233 100644
--- a/kspy/classinfoview.h
+++ b/kspy/classinfoview.h
@@ -26,7 +26,7 @@
   */
 
 class ClassInfoView : public TDEListView  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
    ClassInfoView(TQWidget *parent=0, const char *name=0);
diff --git a/kspy/kspy.h b/kspy/kspy.h
index e1e8565d..b749fcbb 100644
--- a/kspy/kspy.h
+++ b/kspy/kspy.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 #ifndef KSPY_H
 #define KSPY_H
 
diff --git a/kspy/navview.cpp b/kspy/navview.cpp
index 43ba8407..f1a628d9 100644
--- a/kspy/navview.cpp
+++ b/kspy/navview.cpp
@@ -32,8 +32,8 @@ NavView::NavView(TQWidget *parent, const char *name ) : TDEListView(parent,name)
   setAllColumnsShowFocus( true );
   setFullWidth( true );
 
-  connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           this, TQT_SLOT( selectItem( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           this, TQ_SLOT( selectItem( TQListViewItem * ) ) );
 }
 
 NavView::~NavView(){
diff --git a/kspy/navview.h b/kspy/navview.h
index ed87da79..6ec38ac2 100644
--- a/kspy/navview.h
+++ b/kspy/navview.h
@@ -28,7 +28,7 @@ class NavViewItem;
   */
 class NavView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: 
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 2b625c6a..12beae7b 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -114,13 +114,8 @@ void PropsView::buildList( TQObject *o )
        case TQVariant::Int:
          val.setNum( v.toInt() );
          if (mp->isEnumType()) {
-#ifdef USE_QT4
-//            TQMetaObject * metaObject = *(mp->meta);										// FIXME
-           val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt()));	// FIXME
-#else // USE_QT4
            TQMetaObject * metaObject = *(mp->meta);
            val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt()));
-#endif // USE_QT4
          }
          break;
        case TQVariant::Point:
diff --git a/kspy/propsview.h b/kspy/propsview.h
index 7ce538f3..d10de3bf 100644
--- a/kspy/propsview.h
+++ b/kspy/propsview.h
@@ -26,7 +26,7 @@
   */
 
 class PropsView : public TDEListView  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
 	PropsView(TQWidget *parent=0, const char *name=0);
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index bb5505e5..058cb3e3 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -64,7 +64,7 @@ void ReceiversView::buildList( TQObject *o )
       {
         new TDEListViewItem( conn,
                            connection->object()->name(), 
-                           connection->memberType() == 1 ? "SLOT" : "SIGNAL",
+                           connection->memberType() == 1 ? "TQ_SLOT" : "TQ_SIGNAL",
                            connection->memberName() );
       }
     }
diff --git a/kspy/receiversview.h b/kspy/receiversview.h
index 420e16a4..0723ddaa 100644
--- a/kspy/receiversview.h
+++ b/kspy/receiversview.h
@@ -26,7 +26,7 @@
   */
 
 class ReceiversView : public TDEListView  {
-   Q_OBJECT
+   TQ_OBJECT
    
 public: 
    ReceiversView(TQWidget *parent=0, const char *name=0);
diff --git a/kspy/sigslotview.h b/kspy/sigslotview.h
index 97615cdc..b88bbcd2 100644
--- a/kspy/sigslotview.h
+++ b/kspy/sigslotview.h
@@ -26,7 +26,7 @@
   */
 
 class SigSlotView : public TDEListView  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
    SigSlotView(TQWidget *parent=0, const char *name=0);
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 24ebaf4f..a7d99e5d 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -74,14 +74,14 @@ Spy::Spy( TQWidget *parent, const char *name )
 
   mNavView->buildTree();
 
-  connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ),
-           mPropsView, TQT_SLOT( setTarget( TQObject * ) ) );
-  connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ),
-           mSigSlotView, TQT_SLOT( setTarget( TQObject * ) ) );
-  connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ),
-           mReceiversView, TQT_SLOT( setTarget( TQObject * ) ) );
-  connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ),
-           mClassInfoView, TQT_SLOT( setTarget( TQObject * ) ) );
+  connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ),
+           mPropsView, TQ_SLOT( setTarget( TQObject * ) ) );
+  connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ),
+           mSigSlotView, TQ_SLOT( setTarget( TQObject * ) ) );
+  connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ),
+           mReceiversView, TQ_SLOT( setTarget( TQObject * ) ) );
+  connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ),
+           mClassInfoView, TQ_SLOT( setTarget( TQObject * ) ) );
 }
 
 Spy::~Spy()
@@ -92,10 +92,10 @@ Spy::~Spy()
 void Spy::setTarget( TQWidget *target )
 {
   mTarget = target;
-  mPropsView->buildList( TQT_TQOBJECT(mTarget) );
-  mSigSlotView->buildList( TQT_TQOBJECT(mTarget) );
-  mReceiversView->buildList( TQT_TQOBJECT(mTarget) );
-  mClassInfoView->buildList( TQT_TQOBJECT(mTarget) );
+  mPropsView->buildList( mTarget );
+  mSigSlotView->buildList( mTarget );
+  mReceiversView->buildList( mTarget );
+  mClassInfoView->buildList( mTarget );
 }
 
 void Spy::keyPressEvent( TQKeyEvent *event )
diff --git a/kspy/spy.h b/kspy/spy.h
index f78a78f3..42a45114 100644
--- a/kspy/spy.h
+++ b/kspy/spy.h
@@ -36,7 +36,7 @@ class ClassInfoView;
  */
 class Spy : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: