1 files changed, 10 insertions, 10 deletions
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 1435195..21aebff 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -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));
@@ -217,7 +217,7 @@ void FilesystemWidget::showMenu(uint id)
 
   TQPopupMenu menu;
   menu.insertItem(SmallIcon("drive-harddisk-mounted"), i18n("&Mount Device"), 1);
-  menu.insertItem(SmallIcon("drive-harddisk"), i18n("&Unmount Device"), 2);
+  menu.insertItem(SmallIcon("drive-harddisk-unmounted"), i18n("&Unmount Device"), 2);
 
   switch (menu.exec(TQCursor::pos())) {
     case 1: