1 files changed, 27 insertions, 27 deletions

diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 3a3a7029..e8929f84 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -303,32 +303,32 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name)
   setLineWidth(2);
   setFullWidth(true);
   setShowSortIndicator(true);
-  setFocusPolicy(TQ_ClickFocus);
+  setFocusPolicy(TQWidget::ClickFocus);
   setShowFolderOpenPixmap(false);
 
-  connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)),
-          this, TQT_SLOT(slotReturnPressed(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)),
+          this, TQ_SLOT(slotReturnPressed(TQListViewItem *)));
 
-  connect(this, TQT_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)),
-          this, TQT_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)));
+  connect(this, TQ_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)),
+          this, TQ_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)));
 
-  connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )),
-          this, TQT_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int )));
+  connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )),
+          this, TQ_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int )));
 
-  connect(this, TQT_SIGNAL(executed(TQListViewItem *)),
-          this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(executed(TQListViewItem *)),
+          this, TQ_SLOT(slotSelectFile(TQListViewItem *)));
 
-  connect(this, TQT_SIGNAL(openFile(const KURL &)),
-          quantaApp, TQT_SLOT(slotFileOpen(const KURL &)));
+  connect(this, TQ_SIGNAL(openFile(const KURL &)),
+          quantaApp, TQ_SLOT(slotFileOpen(const KURL &)));
 
-  connect(this, TQT_SIGNAL(openImage(const KURL &)),
-          quantaApp, TQT_SLOT(slotImageOpen(const KURL &)));
+  connect(this, TQ_SIGNAL(openImage(const KURL &)),
+          quantaApp, TQ_SLOT(slotImageOpen(const KURL &)));
 
-  connect(this, TQT_SIGNAL(closeFile(const KURL &)),
-          quantaApp, TQT_SLOT(slotFileClose(const KURL &)));
+  connect(this, TQ_SIGNAL(closeFile(const KURL &)),
+          quantaApp, TQ_SLOT(slotFileClose(const KURL &)));
 
-  connect(this, TQT_SIGNAL(insertTag(const KURL &, DirInfo)),
-          quantaApp, TQT_SLOT(slotInsertTag(const KURL &, DirInfo)));
+  connect(this, TQ_SIGNAL(insertTag(const KURL &, DirInfo)),
+          quantaApp, TQ_SLOT(slotInsertTag(const KURL &, DirInfo)));
 }
 
 
@@ -554,7 +554,7 @@ void BaseTreeView::slotOpenWith()
 
 void BaseTreeView::slotOpenWithApplication()
 {
-  KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+  KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name());
   if (ptr)
   {
     KURL::List list;
@@ -606,7 +606,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position)
       for (it = offers.begin(); it != offers.end(); ++it)
       {
         TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data());
-        connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication()));
+        connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenWithApplication()));
         action->plug(m_openWithMenu);
         m_openWithActions.append(action);
       }
@@ -621,13 +621,13 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position)
         int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name());
         m_pluginIds[id] = it2.current();
       }
-      connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int)));    
+      connect(m_openWithMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenWithActivated(int)));    
       m_openWithMenu->insertSeparator();
     }
-    m_openWithMenu->insertItem(i18n("&Other..."), this, TQT_SLOT(slotOpenWith()));
+    m_openWithMenu->insertItem(i18n("&Other..."), this, TQ_SLOT(slotOpenWith()));
     m_openWithMenuId = menu->insertItem(i18n("Open &With"), m_openWithMenu, -1, position);
   } else
-    m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()), 0, -1, position);
+    m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()), 0, -1, position);
 }
 
 void BaseTreeView::slotInsertTag()
@@ -740,7 +740,7 @@ void BaseTreeView::slotProperties()
   {
     fileInfoDlg = addFileInfoPage(propDlg);
   }
-  connect(propDlg, TQT_SIGNAL( applied() ), this, TQT_SLOT( slotPropertiesApplied()) );
+  connect(propDlg, TQ_SIGNAL( applied() ), this, TQ_SLOT( slotPropertiesApplied()) );
   propDlg->exec();
 }
 
@@ -915,11 +915,11 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil
   if (!job)
     return;
 
-  connect(job, TQT_SIGNAL( result(TDEIO::Job *) ),
-          this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) );
+  connect(job, TQ_SIGNAL( result(TDEIO::Job *) ),
+          this, TQ_SLOT( slotJobFinished(TDEIO::Job *) ) );
   progressBar->setTotalSteps(100);
-  connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)),
-          this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long)));
+  connect(job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long)),
+          this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long)));
 }