7 files changed, 15 insertions, 15 deletions
diff --git a/ksim/monitors/lm_sensors/NVCtrl.c b/ksim/monitors/lm_sensors/NVCtrl.c
index 6c61b8a..fe5b5c4 100644
--- a/ksim/monitors/lm_sensors/NVCtrl.c
+++ b/ksim/monitors/lm_sensors/NVCtrl.c
@@ -38,8 +38,8 @@ static const char *nvctrl_extension_name = NV_CONTROL_NAME;
 #define XNVCTRLSimpleCheckExtension(dpy,i) \
   XextSimpleCheckExtension (dpy, i, nvctrl_extension_name)
 
-static int close_display();
-static Bool wire_to_event();
+static int close_display(Display*, XExtCodes*);
+static Bool wire_to_event(Display*, XEvent*, xEvent*);
 static const XExtensionHooks nvctrl_extension_hooks = {
     NULL,                               /* create_gc */
     NULL,                               /* copy_gc */
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index 9514bc5..d696c92 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -58,7 +58,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className)
 
 void PluginModule::showAbout()  
 {
-  TQString version = kapp->aboutData()->version();
+  TQString version = tdeApp->aboutData()->version();
 
   TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Sensors Plugin"), version.latin1(),
@@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name)
   config()->setGroup("Sensors");
   (new TQVBoxLayout(this))->setAutoAdd(true);
 
-  connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)),
-     this, TQT_SLOT(updateSensors(const SensorList &)));
+  connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)),
+     this, TQ_SLOT(updateSensors(const SensorList &)));
 
   insertSensors();
 }
diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h
index 9c1e801..f53082d 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.h
+++ b/ksim/monitors/lm_sensors/ksimsensors.h
@@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject
 
 class SensorsView : public KSim::PluginView, public KSimSensorsIface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     SensorsView(KSim::PluginObject *parent, const char *name);
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index c81ad56..2852134 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -25,7 +25,7 @@
 #include <tdelocale.h>
 #include <tqglobal.h>
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 #include <tqtimer.h>
@@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject()
   }
 
   m_updateTimer = new TQTimer(this);
-  connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update()));
+  connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update()));
 }
 
 SensorBase::~SensorBase()
diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h
index 948a09b..8882920 100644
--- a/ksim/monitors/lm_sensors/sensorbase.h
+++ b/ksim/monitors/lm_sensors/sensorbase.h
@@ -90,7 +90,7 @@ class SensorList : public TQValueList<SensorInfo>
 
 class SensorBase : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     static SensorBase *self();
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 1a1f4a1..e8afb88 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
   m_sensorView->setColumnWidth(1, 60);
   m_sensorView->setColumnWidth(2, 80);
   m_sensorView->setAllColumnsShowFocus(true);
-  connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *,
-     TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *,
+  connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *,
+     TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *,
      TQListViewItem *, const TQPoint &)));
 
-  connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-     TQT_SLOT( modify( TQListViewItem * ) ) );
+  connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+     TQ_SLOT( modify( TQListViewItem * ) ) );
 
   m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3);
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
-  connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
+  connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) );
   m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 );
 
   m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this);
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h
index dff799e..7922433 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.h
+++ b/ksim/monitors/lm_sensors/sensorsconfig.h
@@ -35,7 +35,7 @@ class TQTimer;
 
 class SensorsConfig : public KSim::PluginPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     SensorsConfig(KSim::PluginObject *parent, const char *name);