6 files changed, 16 insertions, 21 deletions
diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp
index 5c1cf3a..045e2ad 100644
--- a/ksim/monitors/filesystem/filesystemstats.cpp
+++ b/ksim/monitors/filesystem/filesystemstats.cpp
@@ -175,12 +175,7 @@ FilesystemStats::List FilesystemStats::readEntries()
       Entry entry;
       entry.dir = sfs[i].f_mntonname;
       entry.fsname = sfs[i].f_mntfromname;
-
-#ifdef __osf__
-      entry.type = getvfsbynumber(sfs[i].f_type);
-#else
       entry.type = sfs[i].f_fstypename;
-#endif
 
       list.append( entry );
     }
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 2fb77e1..82f3f7b 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
@@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
   while ((filesystem = it.current()) != 0) {
     ++it;
 
-    if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) {
+    if (filesystem->display() == o) {
       progressBar = filesystem->display();
       break;
     }
@@ -149,15 +149,15 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
     ++i;
   }
 
-  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress)
+  if (o == progressBar && e->type() == TQEvent::MouseButtonPress)
   {
-    switch(TQT_TQMOUSEEVENT(e)->button()) {
-      case Qt::RightButton:
+    switch(static_cast<TQMouseEvent*>(e)->button()) {
+      case TQt::RightButton:
         showMenu(i);
         break;
       default:
         break;
-      case Qt::LeftButton:
+      case TQt::LeftButton:
         if (parentWidget()->inherits("KSim::PluginView"))
           static_cast<KSim::PluginView *>(parentWidget())->doCommand();
         break;
@@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po
 {
   m_process = new TDEProcess();
   connect(m_process,
-     TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-     TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
+     TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+     TQ_SLOT(receivedStderr(TDEProcess *, char *, int)));
   connect(m_process,
-     TQT_SIGNAL(processExited(TDEProcess *)),
-     TQT_SLOT(processExited(TDEProcess *)));
+     TQ_SIGNAL(processExited(TDEProcess *)),
+     TQ_SLOT(processExited(TDEProcess *)));
 
   (*m_process) << command << point;
   void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr));
diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h
index 2a8f116..6e7f330 100644
--- a/ksim/monitors/filesystem/filesystemwidget.h
+++ b/ksim/monitors/filesystem/filesystemwidget.h
@@ -29,7 +29,7 @@ class TQVBoxLayout;
 
 class FilesystemWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     FilesystemWidget(TQWidget *parent, const char *name);
diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h
index fe37957..8322bcd 100644
--- a/ksim/monitors/filesystem/fsystemconfig.h
+++ b/ksim/monitors/filesystem/fsystemconfig.h
@@ -32,7 +32,7 @@ class TQListBoxItem;
 
 class FsystemConfig : public KSim::PluginPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     FsystemConfig(KSim::PluginObject *parent, const char *name);
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 278a891..1f95a08 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -64,7 +64,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 FileSystem Plugin"), version.latin1(),
@@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name)
   createFreeInfo();
 
   m_updateTimer = new TQTimer(this);
-  connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS()));
+  connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS()));
   m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000);
 }
 
@@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const
   TQStringList::ConstIterator it;
   for (it = list.begin(); it != list.end(); ++it) {
     splitList = TQStringList::split(":", (*it));
-    newList.append(tqMakePair(splitList[0], splitList[1]));
+    newList.append(qMakePair(splitList[0], splitList[1]));
   }
 
   return newList;
diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h
index 1583ba1..63e192c 100644
--- a/ksim/monitors/filesystem/ksimfsystem.h
+++ b/ksim/monitors/filesystem/ksimfsystem.h
@@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject
 
 class Fsystem : public KSim::PluginView, public FsystemIface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     /**