Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)

1 files changed, 41 insertions, 41 deletions

diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 8c8917a2..1e4a208c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -62,7 +62,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
     setReadWrite(true);
     setModified(false);
 
-    connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool)));
+    connect(m_widget, TQ_SIGNAL(formModified(bool )), this, TQ_SLOT(formModified(bool)));
 }
 
 void KDevDesignerPart::setupDesignerWindow()
@@ -87,48 +87,48 @@ static TQIconSet createPartIconSet( const TQString &name )
 void KDevDesignerPart::setupActions( )
 {
     TDEAction *action;
-    action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-    action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection());
+    action = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
+    action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+    action = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection());
     stateSync(action, m_widget->actionFileClose);
-    action = KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+    action = KStdAction::save(this, TQ_SLOT(save()), actionCollection());
     stateSync(action, m_widget->actionFileSave);
-    action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
+    action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
     stateSync(action, m_widget->actionFileSaveAs);
-    action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall");
+    action = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(fileSaveAs()), actionCollection(), "file_saveall");
     stateSync(action, m_widget->actionFileSaveAll);
-    new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate");
+    new TDEAction(i18n("Create &Template..."), 0, this, TQ_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate");
 
-    action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection());
+    action = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection());
     stateSync(action, m_widget->actionEditUndo);
-    action = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection());
+    action = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection());
     stateSync(action, m_widget->actionEditRedo);
-    action = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection());
+    action = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection());
     stateSync(action, m_widget->actionEditCut);
-    action = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection());
+    action = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection());
     stateSync(action, m_widget->actionEditCopy);
-    action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection());
+    action = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection());
     stateSync(action, m_widget->actionEditPaste);
-    action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete");
+    action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete");
     stateSync(action, m_widget->actionEditDelete);
-    action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection());
+    action = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection());
     stateSync(action, m_widget->actionEditSelectAll);
-    action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels");
+    action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_accels");
     stateSync(action, m_widget->actionEditAccels);
-    action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions");
+    action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQ_SLOT(editFunctions()), actionCollection(), "edit_functions");
     stateSync(action, m_widget->actionEditFunctions);
-    action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections");
+    action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections");
     stateSync(action, m_widget->actionEditConnections);
-    action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings");
+    action = new TDEAction(i18n("&Form Settings..."), 0, this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_formsettings");
     stateSync(action, m_widget->actionEditFormSettings);
 
-    action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile");
+    action = new TDEAction(i18n("&Add File..."), 0, this, TQ_SLOT(projectAddFile()), actionCollection(), "project_addfile");
     stateSync(action, m_widget->actionProjectAddFile);
-    action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection");
+    action = new TDEAction(i18n("&Image Collection..."), 0, this, TQ_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection");
     stateSync(action, m_widget->actionEditPixmapCollection);
-    action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections");
+    action = new TDEAction(i18n("&Database Connections..."), 0, this, TQ_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections");
     stateSync(action, m_widget->actionEditDatabaseConnections);
-    action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings");
+    action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQ_SLOT(projectSettings()), actionCollection(), "project_settings");
     stateSync(action, m_widget->actionEditProjectSettings);
 
     TDERadioAction *toggle;
@@ -141,34 +141,34 @@ void KDevDesignerPart::setupActions( )
     setupToolsAction(toggle, m_widget->actionOrderTool);
     toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy");
     setupToolsAction(toggle, m_widget->actionBuddyTool);
-    new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
-    new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
+    new TDEAction(i18n("Configure Toolbox..."), 0, this, TQ_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
+    new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQ_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
 
-    action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
+    action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQ_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
     stateSync(action, m_widget->actionEditAdjustSize);
-    action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+    action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQ_SLOT(layoutHLayout()), actionCollection(), "layout_h");
     stateSync(action, m_widget->actionEditHLayout);
-    action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+    action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQ_SLOT(layoutVLayout()), actionCollection(), "layout_v");
     stateSync(action, m_widget->actionEditVLayout);
-    action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
+    action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQ_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
     stateSync(action, m_widget->actionEditGridLayout);
-    action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+    action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
     stateSync(action, m_widget->actionEditSplitHorizontal);
-    action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+    action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
     stateSync(action, m_widget->actionEditSplitVertical);
-    action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
+    action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQ_SLOT(layoutBreak()), actionCollection(), "layout_break");
     stateSync(action, m_widget->actionEditBreakLayout);
     toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
     setupToolsAction(toggle, m_widget->actionInsertSpacer);
 
-    action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
+    action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQ_SLOT(windowPreview()), actionCollection(), "window_preview");
     stateSync(action, m_widget->actionPreview);
-    action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next");
+    action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQ_SLOT(windowNext()), actionCollection(), "window_next");
     stateSync(action, m_widget->actionWindowNext);
-    action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev");
+    action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQ_SLOT(windowPrev()), actionCollection(), "window_prev");
     stateSync(action, m_widget->actionWindowPrevious);
 
-    action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection());
+    action = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection());
     action->setText(i18n("Configure &KDevDesigner..."));
     stateSync(action, m_widget->actionEditPreferences);
 }
@@ -217,7 +217,7 @@ void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction )
     DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction);
     if (!ac)
         return;
-    connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool )));
+    connect(ac, TQ_SIGNAL(actionEnabled(bool )), tdeaction, TQ_SLOT(setEnabled(bool )));
 }
 
 void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action )
@@ -227,8 +227,8 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act
 
     toggle->setGroup("tools");
     toggle->setExclusiveGroup("tools");
-    connect(action, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool )));
-    connect(toggle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToggleActionOn(bool)));
+    connect(action, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool )));
+    connect(toggle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToggleActionOn(bool)));
     toggle->setChecked(action->isOn());
     m_actionMap[action] = toggle;
     m_actionMap2[toggle] = action;
@@ -495,9 +495,9 @@ void KDevDesignerPart::setToggleActionOn( bool b )
     TQAction *qaction = m_actionMap2[action];
     if (!qaction)
         return;
-    disconnect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool )));
+    disconnect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool )));
     qaction->setOn(b);
-    connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool )));
+    connect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool )));
 }
 
 void KDevDesignerPart::openProject( const TQString & // projectFile