Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

12 files changed, 193 insertions, 193 deletions

diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 6abdc5b7..e8929f84 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -306,29 +306,29 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name)
   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)));
 }
 
 
@@ -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)));
 }
 
 
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index abe67424..a379b512 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -56,15 +56,15 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name )
   slotRefreshTree();
   setFocusPolicy(TQWidget::ClickFocus);
 
-  connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) );
-  connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)) );
+  connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *)));
 
   m_contextMenu  = new TDEPopupMenu(this);
-  m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs()));
-  m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc()));
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQ_SLOT(slotReloadProjectDocs()));
+  m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQ_SIGNAL(downloadDoc()));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 444bbc0c..1884cc1b 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -87,49 +87,49 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
 
   m_fileMenu = new TDEPopupMenu(this);
 
-  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
-  m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen()));
+  m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
-  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu();
 
-  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
-  m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop()));
-  m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
+  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()));
+  m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQ_SLOT(slotAddToTop()));
+  m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate()));
   m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
-  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
-  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
-  m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias()));
-  m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste()));
+  m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQ_SLOT(slotChangeAlias()));
+  m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
+  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
-  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
+  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload()));
 
   m_emptyMenu = new TDEPopupMenu();
 
-  m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0);
+  m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()), 0, -1 , 0);
 
   addColumn(i18n("Files Tree"), -1);
   addColumn("");
 
-  connect(this, TQT_SIGNAL(open(TQListViewItem *)),
-          this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQ_SIGNAL(open(TQListViewItem *)),
+          this, TQ_SLOT(slotSelectFile(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   // generate top list of directories
   for (uint i = 0; i <  topURLList.count(); i++)
diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp
index 48fd6b5e..2ccc770c 100644
--- a/quanta/treeviews/newtemplatedirdlg.cpp
+++ b/quanta/treeviews/newtemplatedirdlg.cpp
@@ -20,8 +20,8 @@
 NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name)
 {
   setCaption(name);
-  connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-  connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+  connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+  connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 }
 
 NewTemplateDirDlg::~NewTemplateDirDlg()
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index c07a7183..886bd511 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -122,62 +122,62 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_projectDir->root()->setEnabled(false);
 
   m_uploadStatusMenu = new TDEPopupMenu(this);
-  m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload()));
-  m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload()));
-  m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload()));
-  connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow()));
+  m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQ_SLOT(slotAlwaysUpload()));
+  m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQ_SLOT(slotNeverUpload()));
+  m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQ_SLOT(slotConfirmUpload()));
+  connect(m_uploadStatusMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUploadMenuAboutToShow()));
 
   m_fileMenu = new TDEPopupMenu(this);
 
-  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen()));
-  m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar()));
-  m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQ_SLOT(slotOpen()));
+  m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQ_SLOT(slotLoadToolbar()));
+  m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL()));
-  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL()));
-  m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
-  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQ_SLOT(slotUploadSingleURL()));
+  m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQ_SLOT(slotQuickUploadURL()));
+  m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
+  m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int)));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
-  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
   m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL()));
-  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL()));
-  m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
-  m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
-  m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
-  m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQ_SLOT(slotUploadSingleURL()));
+  m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQ_SLOT(slotQuickUploadURL()));
+  m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate()));
+  m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
+  m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int)));
+  m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
+  m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQ_SLOT(slotChangeDocumentFolderStatus()));
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
 
   m_projectMenu = new TDEPopupMenu(this);
   m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
   m_projectMenu->insertSeparator();
-  m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject()));
-  m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan()));
-  m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions()));
-  m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
+  m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQ_SLOT(slotUploadProject()));
+  m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQ_SLOT(slotRescan()));
+  m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQ_SLOT(slotOptions()));
+  m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload()));
   m_projectMenu->insertSeparator();
   m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
 
 
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
-  connect(this, TQT_SIGNAL(open(TQListViewItem *)),
-          this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(open(TQListViewItem *)),
+          this, TQ_SLOT(slotSelectFile(TQListViewItem *)));
 
   restoreLayout(kapp->config(), className());
   // the restored size of the first column might be too large for the current content
@@ -212,8 +212,8 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url)
     setRootIsDecorated(false);
   }
 
-  connect(m_projectDir, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)),
-          this,           TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*)));
+  connect(m_projectDir, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)),
+          this,           TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*)));
   addBranch(m_projectDir);
   m_projectDir->urlList = m_projectFiles;  // set list for filter
   if (!m_projectName.isEmpty())
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 78dbd78e..de2e3430 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -84,23 +84,23 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
   m_localDir->excludeFilterRx.setPattern(excludeString);
 
   m_fileMenu = new TDEPopupMenu(this);
-  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
-  m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQ_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQ_SLOT(slotRun()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript()));
-  m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta()));
-  m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription()));
+  m_fileMenu->insertItem(i18n("&Edit Script"), this, TQ_SLOT(slotEditScript()));
+  m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQ_SLOT(slotEditInQuanta()));
+  m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQ_SLOT(slotEditDescription()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction()));
-  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail()));
-  m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript()));
+  m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQ_SLOT(slotAssignAction()));
+  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQ_SLOT(slotSendScriptInMail()));
+  m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQ_SLOT(slotUploadScript()));
 
   m_folderMenu = new TDEPopupMenu(this);
-  m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript()));
+  m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQ_SIGNAL(downloadScript()));
 
 
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   restoreLayout( kapp->config(), className() );
   // the restored size of the first column might be too large for the current content
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 922ea03a..5f9a9747 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -100,37 +100,37 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
 
   m_fileMenu = new TDEPopupMenu();
 
-  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
-  m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen()));
+  m_fileMenu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-//  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
-  m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
+//  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
+  m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu();
 
-//  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
-  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
-  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
-  m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
+//  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste()));
+  m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
+  m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
-  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
+  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload()));
 
   addColumn(i18n("Upload Tree"), -1);
   addColumn("");
 
-  connect(this, TQT_SIGNAL(open(TQListViewItem *)),
-          this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
-  connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
-          this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
+  connect(this, TQ_SIGNAL(open(TQListViewItem *)),
+          this, TQ_SLOT(slotSelectFile(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  connect(Project::ref(), TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
+          this, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
 
   restoreLayout(m_config, "UploadTreeView");  // a fixed name only for the tooltip configuration
   // the restored size of the first column might be too large for the current content
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index f2b827cc..a03f13a3 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -95,43 +95,43 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name )
     dtdMenu->insertItem(dtdList[i], i, -1);
   }
 
-  connect(dtdMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDTDChanged(int)));
+  connect(dtdMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDTDChanged(int)));
     
-  connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
-          TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+  connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+          TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
   
   emptyAreaMenu = new TDEPopupMenu(this);
   emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu);
-  emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"),     this, TQT_SLOT(slotReparseMenuItem()));
+  emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"),     this, TQ_SLOT(slotReparseMenuItem()));
 
   popupMenu = new TDEPopupMenu(this);
 
   popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu);
   popupMenu -> insertSeparator();
-  popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQT_SLOT(slotSelectTag()));
-  popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQT_SLOT(slotGotoClosingTag()));
-  openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQT_SLOT(slotOpenFile()));
+  popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQ_SLOT(slotSelectTag()));
+  popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQ_SLOT(slotGotoClosingTag()));
+  openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQ_SLOT(slotOpenFile()));
   popupMenu -> insertSeparator();
-  popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQT_SLOT(slotOpenSubTree()));
-  popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQT_SLOT(slotCloseSubTree()));
+  popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQ_SLOT(slotOpenSubTree()));
+  popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQ_SLOT(slotCloseSubTree()));
   popupMenu -> insertSeparator();
 #if 0
-  popupMenu -> insertItem( i18n("Remove"),this ,TQT_SLOT(slotRemoveTags()));
+  popupMenu -> insertItem( i18n("Remove"),this ,TQ_SLOT(slotRemoveTags()));
   popupMenu -> insertSeparator();
 #endif
-  popupMenu -> insertItem( SmallIcon("reload"),  i18n("&Reparse"),     this ,TQT_SLOT(slotReparseMenuItem()));
-  followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQT_SLOT(changeFollowCursor()));
+  popupMenu -> insertItem( SmallIcon("reload"),  i18n("&Reparse"),     this ,TQ_SLOT(slotReparseMenuItem()));
+  followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQ_SLOT(changeFollowCursor()));
 
   popupMenu -> setItemChecked ( followCursorId, followCursor() );
 
 
-  connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-           this, TQT_SLOT  (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int)));
+  connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+           this, TQ_SLOT  (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int)));
 
-  connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
+  connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *)));
 
-  connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), TQT_SLOT(slotExpanded(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), TQT_SLOT(slotCollapsed(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), TQ_SLOT(slotExpanded(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), TQ_SLOT(slotCollapsed(TQListViewItem *)));
 
   write = 0L;
   timer = new TQTime();
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 556a2823..e42754c9 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -133,12 +133,12 @@ void ParentItem::showList(bool show)
   if (show)
   {
       comboBox->show();
-      TQObject::connect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int)));
+      TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int)));
   }
   else
   {
       comboBox->hide();
-      TQObject::disconnect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int)));
+      TQObject::disconnect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int)));
   }
 }
 
@@ -156,7 +156,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con
   m_listView = listView;
   lin = new TQLineEdit( m_listView->viewport() );
   lin2 = new TQLineEdit( m_listView->viewport() );
-  TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) );
   lin->hide();
   lin2->hide();
 }
@@ -169,7 +169,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons
   lin2 = new TQLineEdit( m_listView->viewport() );
   lin2->setText(title);
   lin->setText(title2);
-  TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) );
   lin->hide();
   lin2->hide();
 }
@@ -183,7 +183,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons
   lin2 = new TQLineEdit( m_listView->viewport() );
   lin2->setText(title);
   lin->setText(title2);
-  TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) );
   lin->hide();
   lin2->hide();
 }
@@ -292,7 +292,7 @@ AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem*
   combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanTrue);
   combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanFalse);
   combo->hide();
-  TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) );
  }
 
 AttributeBoolItem::~AttributeBoolItem()
@@ -331,7 +331,7 @@ AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* p
   urlRequester = new KURLRequester( m_listView->viewport() );
   urlRequester->setMode(KFile::File | KFile::ExistingOnly );
   urlRequester->hide();
-  TQObject::connect( urlRequester, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( urlRequester, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) );
  }
 
 AttributeUrlItem::~AttributeUrlItem()
@@ -409,7 +409,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par
     combo->setEditable(true);
   }
   combo->hide();
-  TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) );
  }
 
 AttributeListItem::~AttributeListItem()
@@ -462,7 +462,7 @@ AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* p
   combo = new KColorCombo( m_listView->viewport() );
   combo->setEditable(true);
   combo->hide();
-  TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) );
  }
 
 AttributeColorItem::~AttributeColorItem()
@@ -508,7 +508,7 @@ AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* p
   //combo->setEditable(true);
   m_se->hide();
 
-  TQObject::connect( m_se->button(), TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( editorContentChanged() ) );
+  TQObject::connect( m_se->button(), TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( editorContentChanged() ) );
  }
 
 AttributeStyleItem::~AttributeStyleItem()
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 335fafc6..4d74e548 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -106,8 +106,8 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name)
   curCol = 0;
   setFocusPolicy(TQWidget::ClickFocus);
   this->installEventFilter(this);
-  connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )),
-    this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int )));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )),
+    this, TQ_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int )));
 }
 
 DualEditableTree::~DualEditableTree()
@@ -367,8 +367,8 @@ void TagAttributeTree::setCurrentNode(Node *node)
     }
 
   }
-  connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*)));
-  connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*)));
 }
 
 void TagAttributeTree::editorContentChanged()
@@ -423,7 +423,7 @@ void TagAttributeTree::slotParentSelected(int index)
   if (m_parentItem)
   {
     m_newNode = m_parentItem->node(index);
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCurrentNode()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCurrentNode()));
   }
 }
 
@@ -481,9 +481,9 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char
   widgetLayout->addWidget( deleteAll, 0, 3 );
   clearWState( WState_Polished );
 
-  connect(attrTree, TQT_SIGNAL(newNodeSelected(Node *)), this, TQT_SLOT(NodeSelected(Node *)));
-  connect(deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNode()));
-  connect(deleteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSubTree()));
+  connect(attrTree, TQ_SIGNAL(newNodeSelected(Node *)), this, TQ_SLOT(NodeSelected(Node *)));
+  connect(deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNode()));
+  connect(deleteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSubTree()));
 }
 
 EnhancedTagAttributeTree::~EnhancedTagAttributeTree()
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 2fa9b7e1..463a56e4 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -143,35 +143,35 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
 
   m_fileMenu = new TDEPopupMenu(this);
 
-  m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert()));
-  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
-  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
-  m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
-  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject()));
-  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose()));
+  m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQ_SLOT(slotInsert()));
+  m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen()));
+  m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail()));
+  m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate()));
+  m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject()));
+  m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
-  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir()));
-  m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
-  m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate()));
-  m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate()));
-  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
+  m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQ_SLOT(slotNewDir()));
+  m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail()));
+  m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate()));
+  m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate()));
+  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
-  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
-  m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
+  m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy()));
+  m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste()));
+  m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
-  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties()));
+  m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload()));
 
   m_emptyAreaMenu = new TDEPopupMenu(this);
-  m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate()));
+  m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate()));
 
   addColumn(i18n("Templates"), -1);
   addColumn(i18n("Group"), -1);
@@ -182,11 +182,11 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   localURL.setPath(locateLocal("data", resourceDir + "templates/"));
   newBranch(localURL);
 
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
-  connect(this, TQT_SIGNAL(open(TQListViewItem *)),
-          this,  TQT_SLOT(slotSelectFile(TQListViewItem *)));
+  connect(this, TQ_SIGNAL(open(TQListViewItem *)),
+          this,  TQ_SLOT(slotSelectFile(TQListViewItem *)));
 
   setAcceptDrops(true);
   setSelectionMode(TQListView::Single);
@@ -629,7 +629,7 @@ void TemplatesTreeView::slotProperties()
    }
 
    topLayout->addWidget( m_quantaProperties );
-   connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) );
+   connect( propDlg, TQ_SIGNAL( applied() ), this , TQ_SLOT( slotPropertiesApplied()) );
 
   TQString name = url.path() + TMPL;
   TDEConfig config(name);
@@ -862,7 +862,7 @@ void TemplatesTreeView::slotPaste()
     if ( ! currentKFileTreeViewItem()->isDir() )
       url.setFileName("");   // don't paste on files but in dirs
     TDEIO::Job *job = TDEIO::copy( list, url);
-    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 *) ) );
   }
 }
 
@@ -880,11 +880,11 @@ void TemplatesTreeView::slotDelete()
     if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue )
     {
       TDEIO::Job *job = TDEIO::del(url);
-      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 *) ) );
       url.setFileName(url.fileName()+ TMPL);
       if ( TQFileInfo(url.path()).exists() ) {
         TDEIO::Job *job2 = TDEIO::del(url);
-        connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) );
+        connect( job2, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) );
       };
     }
   }
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 4761b25f..da77840e 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -39,11 +39,11 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) :
 
   setFocusPolicy(TQWidget::ClickFocus);
 
-  connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile()));
-  connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-           this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
+  connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectFile()));
+  connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+           this, TQ_SLOT(slotSelectFile(TQListViewItem *)));
 
-  connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int )));
+  connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int )));
 }
 
 UploadTreeView::~UploadTreeView()