Replace various '#define' strings - part 6

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

14 files changed, 217 insertions, 217 deletions

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 2548917b..c41b8368 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -67,12 +67,12 @@ void colorRequester::init()
      TQWidget *widget = (TQWidget*) d->edit;
      setFocusProxy( widget );
 
-     d->connectSignals( TQT_TQOBJECT(this) );
+     d->connectSignals( this );
      connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() ));
      connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) ));
 
      TDEAccel *accel = new TDEAccel( this );
-     accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
+     accel->insert( TDEStdAccel::Open, this, TQT_SLOT( openColorDialog() ));
      accel->readSettings();
  }
 
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index c449b184..34cd9e6f 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){
   unsigned int i;
   for(i=0;i<l.length();i++) {
     myCheckListItem *item  = new myCheckListItem(cli,l.item(i).toElement().tagName());
-    item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&)));
+    item->connect(this,TQT_SLOT(removeProperty(const TQVariant&)));
     if(l.item(i).toElement().attribute("hasSub") == "yes")
       appendSub(l.item(i).childNodes(),item);
   }
@@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){
   unsigned int i;
   for(i=0;i<l.length();i++) {
     myCheckListItem *item = new myCheckListItem(lv,l.item(i).toElement().tagName());
-    item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&)));
+    item->connect(this,TQT_SLOT(removeProperty(const TQVariant&)));
     if(l.item(i).toElement().attribute("hasSub") == "yes") {
       TQDomNodeList listSub = l.item(i).childNodes();
       appendSub(listSub,item);
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 389b5402..c2f1bb75 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){
 
 void CSSSelector::setCurrentListView(TQWidget* w){
   TQObjectList *l = w->queryList( "TQListView" );
-  m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first()));
+  m_currentListView = static_cast<TQListView*>(l->first());
 }
 
 void CSSSelector::removeAll(){
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index 4c9531ee..a169d745 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -36,7 +36,7 @@
 
 
 TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name)
-  : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name)
+  : TQWidget(parent,name), TagWidget(parent,name)
 {
   m_dtd = dtd;
   img = 0L;
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 2db18a3e..c94146bb 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -30,13 +30,13 @@
 #include "styleeditor.h"
 
 Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *parent, const char *name)
-    :TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d)
+    :TQWidget(parent,name), TagWidget(parent,name), doc(d)
 {
     initialize(d, dtdTag);
 }
 
 Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name)
-    : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d), m_selection(selection)
+    : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection)
 {
     initialize(d, dtdTag);
 }
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index 89c17f20..ad300f88 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -85,7 +85,7 @@ public:
 
 KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
                          const char *name)
-        : TDEHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name),
+        : TDEHTMLPart(widgetParent, name, parent, name),
         w(part)
 {
     m_contextPopupMenu = new TQPopupMenu();
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index b528c9ff..fcfd9427 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -114,9 +114,9 @@ bool QuantaPlugin::load()
   TQString ow = outputWindow();
   m_targetWidget =  new TQWidget(quantaApp);
   if (m_readOnlyPart)
-      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 );
+      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 );
   else
-      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 );
+      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 );
   if(!m_part)
   {
     KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br>    - <b>%2</b> is not installed;<br>    - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName));
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 21040079..1c8f7179 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -144,12 +144,12 @@ void ProjectPrivate::initActions(TDEActionCollection *ac)
 
   saveAsProjectTemplateAction =
             new TDEAction( i18n( "Save as Project Template..." ), 0,
-                        TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ),
+                        m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ),
                         ac, "save_project_template" );
 
   saveSelectionAsProjectTemplateAction =
                         new TDEAction( i18n( "Save Selection to Project Template File..." ), 0,
-                                    TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ),
+                                    m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ),
                                     ac, "save_selection_project_template" );
   adjustActions();
 }
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index f0df2bb7..11b8efeb 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -210,7 +210,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
   m_quantaInit = new QuantaInit(this);
   dcopSettings = new DCOPSettings;
   dcopQuanta = new DCOPQuanta;
-  DTDs::ref(TQT_TQOBJECT(this));
+  DTDs::ref(this);
   quantaStarted = true;
   tempFileList.setAutoDelete(true);
   m_toolbarList.setAutoDelete(true);
@@ -4771,7 +4771,7 @@ void QuantaApp::slotViewInKFM()
   }
   if ( !w->isUntitled() )
   {
-    TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this));
+    TDEProcess *show = new TDEProcess(this);
     KURL url = Project::ref()->urlWithPrefix(w->url());
     *show << "kfmclient" << "newTab" << url.url();
     show->start( TDEProcess::DontCare );
@@ -4805,7 +4805,7 @@ void QuantaApp::slotViewInLynx()
   }
   if ( !w->isUntitled() )
   {
-    TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this));
+    TDEProcess *show = new TDEProcess(this);
     KURL url = Project::ref()->urlWithPrefix(w->url());
     *show << "konsole"
           << "--nohist"
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 428f9b98..134e34a4 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -123,7 +123,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp)
         : TQObject()
 {
   m_quanta = quantaApp;
-  connect(this, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
+  connect(this, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
 }
 
 QuantaInit::~QuantaInit()
@@ -174,12 +174,12 @@ void QuantaInit::initQuanta()
   readAbbreviations();
 
   // Initialize debugger
-  m_quanta->m_debugger = new DebuggerManager(TQT_TQOBJECT(m_quanta));
+  m_quanta->m_debugger = new DebuggerManager(m_quanta);
   connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
   connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)),
           m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &)));
-  connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
+  connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
 
   //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ );
   m_quanta->createShellGUI(true);
@@ -213,7 +213,7 @@ void QuantaInit::initQuanta()
   if (mdiMode == KMdi::ToplevelMode)
   {
       m_quanta->switchToChildframeMode();
-      TQTimer::singleShot(0, TQT_TQOBJECT(m_quanta), TQT_SLOT(switchToToplevelMode()));
+      TQTimer::singleShot(0, m_quanta, TQT_SLOT(switchToToplevelMode()));
   }
 
   // Always hide debugger toolbar at this point
@@ -257,19 +257,19 @@ void QuantaInit::initQuanta()
      toolviewMenu->plug(m_quanta->windowMenu());
 
   TQPopupMenu *toolbarsMenu  = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta);
-  connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotBuildPrjToolbarsMenu()));
+  connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotBuildPrjToolbarsMenu()));
 
   TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta);
-  connect(contextMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotContextMenuAboutToShow()));
+  connect(contextMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotContextMenuAboutToShow()));
 
   connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 
   m_quanta->slotFileNew();
   m_quanta->slotNewStatus();
@@ -283,12 +283,12 @@ void QuantaInit::initQuanta()
   qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/");
 
   m_quanta->autosaveTimer = new TQTimer(m_quanta);
-  connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer()));
+  connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotAutosaveTimer()));
   m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false);
 
-  connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
+  connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
   connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReloadStructTreeView(bool)));
+          m_quanta, TQT_SLOT(slotReloadStructTreeView(bool)));
 
   // Read list of characters
   TQFile file(locate("appdata","chars"));
@@ -319,7 +319,7 @@ void QuantaInit::initQuanta()
   ViewManager::ref()->activeDocument()->view()->setFocus();
 
   m_quanta->refreshTimer = new TQTimer(m_quanta);
-  connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReparse()));
+  connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotReparse()));
   m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds
   if (qConfig.instantUpdate || qConfig.refreshFrequency == 0)
   {
@@ -338,7 +338,7 @@ void QuantaInit::initStatusBar()
 {
   m_quanta->statusbarTimer = new TQTimer(m_quanta);
   connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(statusBarTimeout()));
+          m_quanta, TQT_SLOT(statusBarTimeout()));
 
   progressBar = new KProgress(m_quanta->statusBar());
   progressBar->setTextEnabled(false);
@@ -361,7 +361,7 @@ void QuantaInit::initDocument()
 {
   m_quanta->m_doc = new QuantaDoc(0L);
   connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
+          m_quanta, TQT_SLOT(slotNewStatus()));
 }
 
 void QuantaInit::initProject()
@@ -371,19 +371,19 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
           pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
   connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
+          m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL &)));
   connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetUserToolbarFiles(KURL::List *)));
+          m_quanta, TQT_SLOT(slotGetUserToolbarFiles(KURL::List *)));
   connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&)));
+          m_quanta, TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&)));
   connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL &, const TQString&)));
+          m_quanta, TQT_SLOT(slotFileOpen(const KURL &, const TQString&)));
   connect(m_project, TQT_SIGNAL(closeFile(const KURL &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileClose(const KURL &)));
+          m_quanta, TQT_SLOT(slotFileClose(const KURL &)));
   connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
           pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
   connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll()));
-  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
   connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)),
           m_project, TQT_SLOT(slotAddDirectory(const KURL&)));
@@ -397,8 +397,8 @@ void QuantaInit::initProject()
   connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)),
           m_project, TQT_SLOT(slotInsertFile(const KURL&)));
   connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadTemplate()));
-  connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadTemplate(const TQString&)));
+          m_quanta, TQT_SLOT(slotDownloadTemplate()));
+  connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQT_SLOT(slotUploadTemplate(const TQString&)));
 
   // inform project if something was renamed
   connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)),
@@ -423,13 +423,13 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&)));
 
   connect(m_project, TQT_SIGNAL(enableMessageWidget()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMessagesView()));
+          m_quanta, TQT_SLOT(slotShowMessagesView()));
 
   connect(m_project, TQT_SIGNAL(messages(const TQString&)),
           m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
 
   connect(m_project, TQT_SIGNAL(newStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
+          m_quanta, TQT_SLOT(slotNewStatus()));
 
   connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -447,15 +447,15 @@ void QuantaInit::initProject()
   connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
           m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
 
-  connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
+  connect(m_project, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
 
   connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
+          m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
 }
 
 void QuantaInit::initView()
 {
-  ViewManager *m_viewManager = ViewManager::ref(TQT_TQOBJECT(m_quanta));
+  ViewManager *m_viewManager = ViewManager::ref(m_quanta);
   connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*)));
   connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed()));
 //   connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*)));
@@ -502,7 +502,7 @@ void QuantaInit::initView()
           m_quanta->fTab, TQT_SLOT(slotReloadAllTrees()));
 
   connect(pTab, TQT_SIGNAL(loadToolbarFile  (const KURL&)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)));
+          m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
   connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)),
           pTab, TQT_SLOT(slotViewActivated(const KURL&)));
 
@@ -516,39 +516,39 @@ void QuantaInit::initView()
           m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&)));
 
   connect(tTab, TQT_SIGNAL(insertFile  (const KURL &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertFile(const KURL &)));
+          m_quanta, TQT_SLOT(slotInsertFile(const KURL &)));
 
   connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileInPreview(const KURL &)));
+          m_quanta, TQT_SLOT(slotOpenFileInPreview(const KURL &)));
   connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowPreviewWidget(bool)));
+          m_quanta, TQT_SLOT(slotShowPreviewWidget(bool)));
   connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&)));
-  connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadScript()));
-  connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadScript(const TQString&)));
-  connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadDoc()));
+          m_quanta, TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&)));
+  connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), m_quanta, TQT_SLOT(slotDownloadScript()));
+  connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), m_quanta, TQT_SLOT(slotUploadScript(const TQString&)));
+  connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), m_quanta, TQT_SLOT(slotDownloadDoc()));
 
   connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)),
-              TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&)));
+              m_quanta, TQT_SLOT(slotStatusMsg(const TQString&)));
   connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)),
-                 TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&)));
+                 m_quanta, TQT_SLOT(slotStatusMsg(const TQString&)));
 
-  connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(setCursorPosition(int,int)));
-  connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT( selectArea(int,int,int,int)));
-  connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSelectTagArea(Node*)));
-  connect(sTab, TQT_SIGNAL(needReparse()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotForceReparse()));
-  connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool)));
+  connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), m_quanta, TQT_SLOT(setCursorPosition(int,int)));
+  connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQT_SLOT( selectArea(int,int,int,int)));
+  connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), m_quanta, TQT_SLOT(slotSelectTagArea(Node*)));
+  connect(sTab, TQT_SIGNAL(needReparse()), m_quanta, TQT_SLOT(slotForceReparse()));
+  connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool)));
   connect(sTab, TQT_SIGNAL(openFile(const KURL &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT  (slotFileOpen(const KURL &)));
+          m_quanta, TQT_SLOT  (slotFileOpen(const KURL &)));
   connect(sTab, TQT_SIGNAL(openImage  (const KURL&)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotImageOpen(const KURL&)));
+          m_quanta, TQT_SLOT(slotImageOpen(const KURL&)));
   connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)),
           m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&)));
   connect(sTab, TQT_SIGNAL(clearProblemOutput()),
           m_quanta->m_problemOutput, TQT_SLOT(clear()));
   connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged()));
 
-  connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(openDoc(const TQString&)));
+  connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), m_quanta, TQT_SLOT(openDoc(const TQString&)));
 
   connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *)));
 
@@ -710,75 +710,75 @@ void QuantaInit::loadInitialProject(const TQString& url)
 void QuantaInit::initActions()
 {
     TDEActionCollection *ac = m_quanta->actionCollection();
-    new TDEAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate");
+    new TDEAction(i18n("Annotate..."), 0, m_quanta, TQT_SLOT(slotAnnotate()),ac, "annotate");
     m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ),
-                        TQT_TQOBJECT(ac), "edit_current_tag" );
+                        m_quanta, TQT_SLOT( slotEditCurrentTag() ),
+                        ac, "edit_current_tag" );
     m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ),
-                        TQT_TQOBJECT(ac), "select_tag_area" );
+                        m_quanta, TQT_SLOT( slotSelectTagArea() ),
+                        ac, "select_tag_area" );
     new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ),
-                        TQT_TQOBJECT(ac), "expand_abbreviation" );
+                        m_quanta, TQT_SLOT( slotExpandAbbreviation() ),
+                        ac, "expand_abbreviation" );
 
-    new TDEAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
+    new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQT_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
 
     //Kate actions
 
 //Edit menu
-    KStdAction::undo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUndo()), ac);
-    KStdAction::redo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRedo()), ac);
-    KStdAction::cut(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCut()), ac);
-    KStdAction::copy(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCopy()), ac) ;
-    KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac);
+    KStdAction::undo(m_quanta, TQT_SLOT(slotUndo()), ac);
+    KStdAction::redo(m_quanta, TQT_SLOT(slotRedo()), ac);
+    KStdAction::cut(m_quanta, TQT_SLOT(slotCut()), ac);
+    KStdAction::copy(m_quanta, TQT_SLOT(slotCopy()), ac) ;
+    KStdAction::pasteText(m_quanta, TQT_SLOT(slotPaste()), ac);
 
 //help
-   (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta),
-      TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip");
+   (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", m_quanta,
+      TQT_SLOT(slotHelpTip()), ac, "help_tip");
 
     // File actions
     //
-    KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew()  ), ac);
-    KStdAction::open   ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open");
-    (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs");
+    KStdAction::openNew( m_quanta, TQT_SLOT( slotFileNew()  ), ac);
+    KStdAction::open   ( m_quanta, TQT_SLOT( slotFileOpen() ), ac, "file_open");
+    (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs");
 
-    m_quanta->fileRecent =  KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)),
+    m_quanta->fileRecent =  KStdAction::openRecent(m_quanta, TQT_SLOT(slotFileOpenRecent(const KURL&)),
                                          ac, "file_open_recent");
     m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent"));
-    connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen()));
+    connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), m_quanta, TQT_SLOT(slotFileOpen()));
 
-    (void) new TDEAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta),
+    (void) new TDEAction( i18n( "Close All" ), 0, m_quanta,
                         TQT_SLOT( slotFileCloseAll() ),
-                        TQT_TQOBJECT(ac), "file_close_all" );
+                        ac, "file_close_all" );
 
-    m_quanta->saveAction = KStdAction::save(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSave() ), ac);
+    m_quanta->saveAction = KStdAction::save(m_quanta, TQT_SLOT( slotFileSave() ), ac);
 
-    KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac );
+    KStdAction::saveAs( m_quanta, TQT_SLOT( slotFileSaveAs() ), ac );
 
     m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(),
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ),
-                        TQT_TQOBJECT(ac), "file_save_all" );
-    (void)  new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta),
-                        TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload");
+                        m_quanta, TQT_SLOT( slotFileSaveAll() ),
+                        ac, "file_save_all" );
+    (void)  new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, m_quanta,
+                        TQT_SLOT(slotFileReload()), ac, "file_reload");
 //    (void)  new TDEAction(i18n("Reload All "), 0, 0, m_quanta,
-//                        TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all");
+//                        TQT_SLOT(slotFileReloadAll()), ac, "file_reload_all");
 
     (void) new TDEAction( i18n( "Save as Local Template..." ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ),
-                        TQT_TQOBJECT(ac), "save_local_template" );
+                        m_quanta, TQT_SLOT( slotFileSaveAsLocalTemplate() ),
+                        ac, "save_local_template" );
 
     (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ),
-                        TQT_TQOBJECT(ac), "save_selection_local_template" );
+                        m_quanta, TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ),
+                        ac, "save_selection_local_template" );
 
-    KStdAction::quit( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileQuit() ), ac );
+    KStdAction::quit( m_quanta, TQT_SLOT( slotFileQuit() ), ac );
 
     // Edit actions
 
     (void) new TDEAction( i18n( "Find in Files..." ),
                         SmallIcon("filefind"), CTRL+ALT+Key_F,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ),
-                        TQT_TQOBJECT(ac), "find_in_files" );
+                        m_quanta, TQT_SLOT( slotEditFindInFiles() ),
+                        ac, "find_in_files" );
 
     TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation");
     aux->setEnabled(false);
@@ -787,78 +787,78 @@ void QuantaInit::initActions()
     // Tool actions
 
     (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ),
-                        TQT_TQOBJECT(ac), "context_help" );
+                        m_quanta, TQT_SLOT( slotContextHelp() ),
+                        ac, "context_help" );
 
     (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down,
                         m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ),
-                        TQT_TQOBJECT(ac), "tag_attributes" );
+                        ac, "tag_attributes" );
 
     (void) new TDEAction( i18n( "&Change the DTD..." ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ),
-                        TQT_TQOBJECT(ac), "change_dtd" );
+                        m_quanta, TQT_SLOT( slotChangeDTD() ),
+                        ac, "change_dtd" );
 
     (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0,
-    TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ),
-    TQT_TQOBJECT(ac), "edit_dtd" );
+    m_quanta, TQT_SLOT( slotEditDTD() ),
+    ac, "edit_dtd" );
 
     (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadDTD() ),
-                        TQT_TQOBJECT(ac), "load_dtd" );
+                        ac, "load_dtd" );
     (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadEntities() ),
-                        TQT_TQOBJECT(ac), "load_entities" );
+                        ac, "load_entities" );
 
     (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ),
-                        TQT_TQOBJECT(ac), "load_dtep" );
+                        m_quanta, TQT_SLOT( slotLoadDTEP() ),
+                        ac, "load_dtep" );
 
     (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ),
-                        TQT_TQOBJECT(ac), "send_dtep" );
+                        m_quanta, TQT_SLOT( slotEmailDTEP() ),
+                        ac, "send_dtep" );
 
     (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ),
-                        TQT_TQOBJECT(ac), "download_dtep" );
+                        m_quanta, TQT_SLOT( slotDownloadDTEP() ),
+                        ac, "download_dtep" );
     (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
-                        TQT_TQOBJECT(ac), "upload_dtep" );
+                        m_quanta, TQT_SLOT( slotUploadDTEP() ),
+                        ac, "upload_dtep" );
 /*
     (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
-                        TQT_TQOBJECT(ac), "send_dtep" );
+                        m_quanta, TQT_SLOT( slotUploadDTEP() ),
+                        ac, "send_dtep" );
 */
     (void) new TDEAction( i18n( "&Document Properties" ), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ),
-                        TQT_TQOBJECT(ac), "tools_document_properties" );
+                        m_quanta, TQT_SLOT( slotDocumentProperties() ),
+                        ac, "tools_document_properties" );
 
     (void) new TDEAction ( i18n ("F&ormat XML Code"), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ),
-                        TQT_TQOBJECT(ac), "tools_code_formatting");
+                        m_quanta, TQT_SLOT( slotCodeFormatting() ),
+                        ac, "tools_code_formatting");
 
     (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()),
-                        TQT_TQOBJECT(ac), "tools_change_case");
+                        m_quanta, TQT_SLOT(slotConvertCase()),
+                        ac, "tools_change_case");
 
     // View actions
 
 
     m_quanta->showSourceAction =
       new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9,
-                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()),
-                         TQT_TQOBJECT(ac), "show_quanta_editor");
+                         m_quanta, TQT_SLOT( slotShowSourceEditor()),
+                         ac, "show_quanta_editor");
     m_quanta->showSourceAction->setExclusiveGroup("view");
 
     m_quanta->showVPLAction =
       new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9,
-      TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ),
-                          TQT_TQOBJECT(ac), "show_kafka_view");
+      m_quanta, TQT_SLOT( slotShowVPLOnly() ),
+                          ac, "show_kafka_view");
     m_quanta->showVPLAction->setExclusiveGroup("view");
 
     m_quanta->showVPLSourceAction =
       new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9,
-                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ),
-                          TQT_TQOBJECT(ac), "show_kafka_and_quanta");
+                         m_quanta, TQT_SLOT( slotShowVPLAndSourceEditor() ),
+                          ac, "show_kafka_and_quanta");
     m_quanta->showVPLSourceAction->setExclusiveGroup("view");
     /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka");
     TQStringList list2;
@@ -866,73 +866,73 @@ void QuantaInit::initActions()
     list2.append(i18n("&VPL Editor (experimental)"));
     list2.append(i18n("&Both Editors"));
     kafkaSelectAction->setItems(list2);
-    connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/
+    connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), m_quanta, TQT_SLOT(slotShowKafkaPartl(int)));*/
 
 
     (void) new TDEAction( i18n( "&Reload Preview" ), "reload",
                         TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(),
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()),
-                        TQT_TQOBJECT(ac), "reload" );
+                        m_quanta, TQT_SLOT(slotRepaintPreview()),
+                        ac, "reload" );
 
     (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(),
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ),
-                        TQT_TQOBJECT(ac), "previous_file" );
+                        m_quanta, TQT_SLOT( slotBack() ),
+                        ac, "previous_file" );
 
     (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(),
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ),
-                        TQT_TQOBJECT(ac), "next_file" );
+                        m_quanta, TQT_SLOT( slotForward() ),
+                        ac, "next_file" );
 
     // Options actions
     //
 
     (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ),
-                        TQT_TQOBJECT(ac), "configure_actions" );
+                        m_quanta, TQT_SLOT( slotOptionsConfigureActions() ),
+                        ac, "configure_actions" );
 
-    KStdAction::showMenubar(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar");
-    KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts");
-    KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars");
-    KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options");
-    new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options");
+    KStdAction::showMenubar(m_quanta, TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar");
+    KStdAction::keyBindings(m_quanta, TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts");
+    KStdAction::configureToolbars(m_quanta, TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars");
+    KStdAction::preferences(m_quanta, TQT_SLOT( slotOptions() ), ac, "general_options");
+    new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQT_SLOT(slotPreviewOptions()), ac, "preview_options");
 
     // Toolbars actions
     m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0,
-                                                           TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)),
-                                                           TQT_TQOBJECT(ac), "toolbars_load_project");
-
-    new TDEAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global");
-    new TDEAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user");
-    new TDEAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local");
-    new TDEAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project");
-    new TDEAction(i18n("&New User Toolbar..."),  0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add");
-    new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove");
-    new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename");
-    new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
-    new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" );
-    new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" );
-
-    TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion");
-    connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion()));
-
-    m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar");
-
-    connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool)));
+                                                           m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)),
+                                                           ac, "toolbars_load_project");
+
+    new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global");
+    new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadToolbar()), ac, "toolbars_load_user");
+    new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local");
+    new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project");
+    new TDEAction(i18n("&New User Toolbar..."),  0, m_quanta, TQT_SLOT(slotAddToolbar()), ac, "toolbars_add");
+    new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRemoveToolbar()), ac, "toolbars_remove");
+    new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRenameToolbar()), ac, "toolbars_rename");
+    new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQT_SLOT(slotSendToolbar()), ac, "toolbars_send");
+    new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotUploadToolbar()), ac, "toolbars_upload" );
+    new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotDownloadToolbar()), ac, "toolbars_download" );
+
+    TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion");
+    connect(toggle, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotSmartTagInsertion()));
+
+    m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar");
+
+    connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotToggleDTDToolbar(bool)));
     m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar"));
 
     new TDEAction(i18n("Complete Text"), CTRL+Key_Space,
-                TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion");
+                m_quanta, TQT_SLOT(slotShowCompletion()), ac,"show_completion");
     new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space,
-                TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint");
+                m_quanta, TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint");
 
-    KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back");
-    KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward");
+    KStdAction::back(m_quanta, TQT_SLOT( slotBack() ), ac, "w_back");
+    KStdAction::forward(m_quanta, TQT_SLOT( slotForward() ), ac, "w_forward");
 
-    new TDEAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor");
-    new TDEAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file");
-    new TDEAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file");
+    new TDEAction(i18n("Open File: none"), 0, m_quanta, TQT_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor");
+    new TDEAction(i18n("Upload..."), 0, m_quanta, TQT_SLOT(slotUploadFile()), ac, "upload_file");
+    new TDEAction(i18n("Delete File"), 0, m_quanta, TQT_SLOT(slotDeleteFile()), ac, "delete_file");
 
     TQString ss = i18n("Upload Opened Project Files...");
-/*    new TDEAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */
+/*    new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQT_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */
 
     TQString error;
     int el, ec;
@@ -993,17 +993,17 @@ void QuantaInit::initActions()
     // create the preview action
     m_quanta->showPreviewAction =
       new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6,
-                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ),
-                         TQT_TQOBJECT(ac), "show_preview" );
+                         m_quanta, TQT_SLOT( slotToggleShowPreview() ),
+                         ac, "show_preview" );
 
     TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0,
-                                  TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()),
-                                  TQT_TQOBJECT(ac), "show_preview_no_frames" );
+                                  m_quanta, TQT_SLOT(slotShowNoFramesPreview()),
+                                  ac, "show_preview_no_frames" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
     act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ),
-                        TQT_TQOBJECT(ac), "view_with_konqueror" );
+                        m_quanta, TQT_SLOT( slotViewInKFM() ),
+                        ac, "view_with_konqueror" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
 
@@ -1024,62 +1024,62 @@ void QuantaInit::initActions()
       act->plug(m_quanta->showPreviewAction->popupMenu());
 
     act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ),
-                        TQT_TQOBJECT(ac), "view_with_lynx" );
+                        m_quanta, TQT_SLOT( slotViewInLynx() ),
+                        ac, "view_with_lynx" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
 
     (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ),
-                        TQT_TQOBJECT(ac), "tag_edit_table" );
+                        m_quanta, TQT_SLOT( slotTagEditTable() ),
+                        ac, "tag_edit_table" );
 
     (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ),
-                        TQT_TQOBJECT(ac), "tag_quick_list" );
+                        m_quanta, TQT_SLOT( slotTagQuickList() ),
+                        ac, "tag_quick_list" );
 
     (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ),
-                        TQT_TQOBJECT(ac), "tag_color" );
+                        m_quanta, TQT_SLOT( slotTagColor() ),
+                        ac, "tag_color" );
 
 
     (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ),
-                        TQT_TQOBJECT(ac), "tag_mail" );
+                        m_quanta, TQT_SLOT( slotTagMail() ),
+                        ac, "tag_mail" );
 
     (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ),
-                        TQT_TQOBJECT(ac), "tag_misc" );
+                        m_quanta, TQT_SLOT( slotTagMisc() ),
+                        ac, "tag_misc" );
 
     (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ),
-                        TQT_TQOBJECT(ac), "tag_frame_wizard" );
+                        m_quanta, TQT_SLOT( slotFrameWizard() ),
+                        ac, "tag_frame_wizard" );
 
     (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ),
-                        TQT_TQOBJECT(ac), "edit_paste_html_quoted" );
+                        m_quanta, TQT_SLOT( slotPasteHTMLQuoted() ),
+                        ac, "edit_paste_html_quoted" );
 
     (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ),
-                        TQT_TQOBJECT(ac), "edit_paste_url_encoded" );
+                        m_quanta, TQT_SLOT( slotPasteURLEncoded() ),
+                        ac, "edit_paste_url_encoded" );
 
     (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0,
-                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ),
-                        TQT_TQOBJECT(ac), "insert_css" );
+                        m_quanta, TQT_SLOT( slotInsertCSS() ),
+                        ac, "insert_css" );
 
     // special-character combo
     TDEAction* char_action = new TDEAction(
                         i18n( "Insert Special Character" ), "charset", 0,
-                        TQT_TQOBJECT(ac), "insert_char" );
+                        ac, "insert_char" );
     connect( char_action, TQT_SIGNAL(activated()),
-             TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) );
+             m_quanta, TQT_SLOT(slotInsertChar()) );
 
-    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
-    QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta)));
+    QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta));
     m_bookmarks->createActions(ac);
-    connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+    connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 }
 
 /** Initialize the plugin architecture. */
@@ -1090,9 +1090,9 @@ void QuantaInit::initPlugins()
   m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta);
 
   connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
+          m_quanta, TQT_SLOT(slotHideSplash()));
   connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
+          m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
 
   m_quanta->m_pluginInterface->readConfig();
   if (!m_quanta->m_pluginInterface->pluginAvailable("TDEFileReplace"))
@@ -1277,11 +1277,11 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
   *(execCommand) << TQStringList::split(" ",cmd);
 
   connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int)));
+          m_quanta, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int)));
   connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int)));
+          m_quanta, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int)));
   connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(TDEProcess*)));
+          m_quanta, TQT_SLOT(slotProcessExited(TDEProcess*)));
 
   if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All))
   {
@@ -1292,7 +1292,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
     //To avoid lock-ups, start a timer.
     TQTimer *timer = new TQTimer(m_quanta);
     connect(timer, TQT_SIGNAL(timeout()),
-            TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout()));
+            m_quanta, TQT_SLOT(slotProcessTimeout()));
     timer->start(180*1000, true);
     QExtFileInfo internalFileInfo;
     m_quanta->m_loopStarted = true;
@@ -1489,8 +1489,8 @@ void QuantaInit::checkRuntimeDependencies()
      CVSService::ref(m_quanta->actionCollection())->setAppId(appId);
      connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear()));
      connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool)));
-     connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&)));
-     //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)),  TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
+     connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&)));
+     //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)),  m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
      m_quanta->fTab->plugCVSMenu();
      pTab->plugCVSMenu();
   }
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index e06201a2..c2717de4 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -122,7 +122,7 @@ void ViewManager::createNewDocument()
                                 "KTextEditor::Document"
                                 );
 #else
-  KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(view), "KTextEditor::Document");
+  KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document");
 #endif
   Document *w = new Document(doc, 0L);
   connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)));
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index ad6dc458..c5d57a56 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -361,7 +361,7 @@ void QuantaBookmarks::gotoLineNumber(int line)
   Document *doc = m_doc;
   if (!doc)
     doc = m_viewManager->activeDocument();
-  TQObject *s = TQT_TQOBJECT(const_cast<TQObject*>(sender()));
+  TQObject *s = const_cast<TQObject*>(sender());
   for (uint i = 0; i < m_othersMenuList.count(); i++)
   {
     if (s == m_othersMenuList[i])
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 116832e9..2eb9bf68 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -281,7 +281,7 @@ void TableTagActionSet::initActionMenus(TQWidget* widget)
 {
     Q_ASSERT(!m_tableActionMenu_0);
 
-    m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
+    m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), widget);
     m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0);
     m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0);
 }
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index b2f61d18..990b4372 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -310,7 +310,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
       TQObjectList* childrenList = queryList("TDEToolBarButton");
       for (uint i = 0; i < childrenList->count(); i++)
       {
-        TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
+        TDEToolBarButton *w = static_cast<TDEToolBarButton*>(childrenList->at(i));
         TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
         TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
         if (TQRect(p1, p2).contains(p))