Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 24 insertions, 24 deletions

diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 990b4372..e23145e3 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags
 {
   m_popupMenu = new TDEPopupMenu(this);
   m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
-  m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
+  m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction()));
   m_popupMenu->insertSeparator();
-  m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar()));
-  m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
-  m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar()));
-  m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar()));
+  m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar()));
+  m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar()));
+  m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar()));
+  m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar()));
 
-  connect(this, TQT_SIGNAL(removeToolbar(const TQString&)),
-          parent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
-  connect(this, TQT_SIGNAL(renameToolbar(const TQString&)),
-          parent, TQT_SLOT(slotRenameToolbar(const TQString&)));
-  connect(this, TQT_SIGNAL(editToolbar(const TQString&)),
-          parent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
-  connect(this, TQT_SIGNAL(newAction()),
-          parent, TQT_SLOT(slotNewAction()));
-  connect(this, TQT_SIGNAL(addToolbar()),
-          parent, TQT_SLOT(slotAddToolbar()));
+  connect(this, TQ_SIGNAL(removeToolbar(const TQString&)),
+          parent, TQ_SLOT(slotRemoveToolbar(const TQString&)));
+  connect(this, TQ_SIGNAL(renameToolbar(const TQString&)),
+          parent, TQ_SLOT(slotRenameToolbar(const TQString&)));
+  connect(this, TQ_SIGNAL(editToolbar(const TQString&)),
+          parent, TQ_SLOT(slotConfigureToolbars(const TQString&)));
+  connect(this, TQ_SIGNAL(newAction()),
+          parent, TQ_SLOT(slotNewAction()));
+  connect(this, TQ_SIGNAL(addToolbar()),
+          parent, TQ_SLOT(slotAddToolbar()));
   TDEAcceleratorManager::setNoAccel(this);
 }
 
@@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl
   m_iconTextMenu->insertItem(i18n("Text Only"), 1);
   m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2);
   m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3);
-  connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int)));
-  connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow()));
+  connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int)));
+  connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow()));
   setIconText(ToolbarTabWidget::ref()->iconText(), false);
 }
 
@@ -306,7 +306,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
       m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex());
       m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - "
                                + i18n(m_toolbarTab->tabUnderMouseLabel.utf8()));
-      m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction()));
+      m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction()));
       TQObjectList* childrenList = queryList("TDEToolBarButton");
       for (uint i = 0; i < childrenList->count(); i++)
       {
@@ -317,18 +317,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
         {
           currentActionName = w->textLabel();
           TQString actionName = currentActionName;
-          m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction()));
-          m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction()));
+          m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction()));
+          m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction()));
           break;
         }
       }
       m_popupMenu->insertSeparator();
-      m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar()));
-      m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar()));
-      m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar()));
+      m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar()));
+      m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar()));
+      m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar()));
       m_popupMenu->insertSeparator();
       m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu);
-      m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar()));
+      m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar()));
     }
     m_popupMenu->popup(p);
   }