Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 61 insertions, 61 deletions

diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index fff01afd..d10c0c2f 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -92,77 +92,77 @@ int forms = 0;
 
 void MainWindow::setupEditActions()
 {
-  actionEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection());
+  actionEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection());
   actionEditUndo->setText(i18n("&Undo: Not Available"));
   actionEditUndo->setToolTip(i18n("Undoes the last action"));
   actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo"));
   actionEditUndo->setEnabled(false);
 
-  actionEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection());
+  actionEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection());
   actionEditRedo->setText(i18n("&Redo: Not Available"));
   actionEditRedo->setToolTip(i18n("Redoes the last undone operation"));
   actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo"));
   actionEditRedo->setEnabled(false);
 
-  actionEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection());
+  actionEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection());
   actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard"));
   actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut"));
   actionEditCut->setEnabled(false);
 
-  actionEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection());
+  actionEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection());
   actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard"));
   actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy"));
   actionEditCopy->setEnabled(false);
 
-  actionEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection());
+  actionEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection());
   actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents"));
   actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste"));
   actionEditPaste->setEnabled(false);
 
-  actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQT_SLOT(editDelete()),
+  actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQ_SLOT(editDelete()),
                                  actionCollection(), "edit_delete");
   actionEditDelete->setToolTip(i18n("Deletes the selected widgets"));
   actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete"));
   actionEditDelete->setEnabled(false);
 
-  actionEditSelectAll = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection());
+  actionEditSelectAll = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection());
   actionEditSelectAll->setToolTip(i18n("Selects all widgets"));
   actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All"));
 
   actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"),
-                                TDEShortcut::null(), this, TQT_SLOT(editRaise()), actionCollection(), "edit_raise");
+                                TDEShortcut::null(), this, TQ_SLOT(editRaise()), actionCollection(), "edit_raise");
   actionEditRaise->setToolTip(i18n("Raises the selected widgets"));
   actionEditRaise->setEnabled(false);
 
   actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"),
-                                TDEShortcut::null(), this, TQT_SLOT(editLower()), actionCollection(), "edit_lower");
+                                TDEShortcut::null(), this, TQ_SLOT(editLower()), actionCollection(), "edit_lower");
   actionEditLower->setToolTip(i18n("Lowers the selected widgets"));
   actionEditLower->setWhatsThis(i18n("Lowers the selected widgets"));
   actionEditLower->setEnabled(false);
 
-  actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
+  actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQ_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
   actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form."));
   actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form"));
-  connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQ_SLOT(setEnabled(bool)));
 
-  actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()),
+  actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()),
                                  actionCollection(), "edit_check_accel");
   actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique"));
   actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator"));
-  connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQ_SLOT(setEnabled(bool)));
 
   actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"),
-                                      TDEShortcut::null(), this, TQT_SLOT(editConnections()), actionCollection(),
+                                      TDEShortcut::null(), this, TQ_SLOT(editConnections()), actionCollection(),
                                       "edit_connections");
   actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections"));
   actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections"));
-  connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQ_SLOT(setEnabled(bool)));
 
   actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(),
-                                       this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_form");
+                                       this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_form");
   actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings"));
   actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings"));
-  connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQ_SLOT(setEnabled(bool)));
 
   TDEToolBar *tb = new TDEToolBar(this, "Edit");
   tb->setFullSize(false);
@@ -198,50 +198,50 @@ void MainWindow::setupEditActions()
 void MainWindow::setupLayoutActions()
 {
   actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"),
-                                     CTRL + Key_J, this, TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size");
+                                     CTRL + Key_J, this, TQ_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size");
   actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget"));
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
   actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"),
-                                  CTRL + Key_H, this, TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
+                                  CTRL + Key_H, this, TQ_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
   actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
   actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally"));
   actionEditHLayout->setEnabled(false);
 
   actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"),
-                                  CTRL + Key_L, this, TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
+                                  CTRL + Key_L, this, TQ_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
   actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
   actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically"));
   actionEditVLayout->setEnabled(false);
 
   actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"),
-                                     CTRL + Key_G, this, TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid");
+                                     CTRL + Key_G, this, TQ_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid");
   actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid"));
   actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
   actionEditGridLayout->setEnabled(false);
 
   actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
-                                          TDEShortcut::null(), this, TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
+                                          TDEShortcut::null(), this, TQ_SLOT(editLayoutHorizontalSplit()), actionCollection(),
                                           "edit_split_h");
   actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
   actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter"));
   actionEditSplitHorizontal->setEnabled(false);
 
   actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
-                                        TDEShortcut::null(), this, TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
+                                        TDEShortcut::null(), this, TQ_SLOT(editLayoutVerticalSplit()), actionCollection(),
                                         "edit_split_v");
   actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
   actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)"));
   actionEditSplitVertical->setEnabled(false);
 
   actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
-                                      CTRL + Key_B, this, TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
+                                      CTRL + Key_B, this, TQ_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
   actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
   actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
 
   int id = WidgetDatabase::idFromClassName("Spacer");
-  TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQT_SLOT(toolSelected()),
+  TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQ_SLOT(toolSelected()),
                                        actionCollection(), TQString::number(id).latin1());
   a->setExclusiveGroup("tool");
   a->setText(i18n("Add ") + WidgetDatabase::className(id));
@@ -280,21 +280,21 @@ void MainWindow::setupLayoutActions()
 void MainWindow::setupToolActions()
 {
   actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2,
-                                        this, TQT_SLOT(toolSelected()), actionCollection(),
+                                        this, TQ_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(POINTER_TOOL).latin1());
   actionPointerTool->setToolTip(i18n("Selects the pointer tool"));
   actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer"));
   actionPointerTool->setExclusiveGroup("tool");
 
   actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"),
-                                        Key_F3, this, TQT_SLOT(toolSelected()), actionCollection(),
+                                        Key_F3, this, TQ_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(CONNECT_TOOL).latin1());
   actionConnectTool->setToolTip(i18n("Selects the connection tool"));
   actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots"));
   actionConnectTool->setExclusiveGroup("tool");
 
   actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"),
-                                      Key_F4, this, TQT_SLOT(toolSelected()), actionCollection(),
+                                      Key_F4, this, TQ_SLOT(toolSelected()), actionCollection(),
                                       TQString::number(ORDER_TOOL).latin1());
   actionOrderTool->setToolTip(i18n("Selects the tab order tool"));
   actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order"));
@@ -344,7 +344,7 @@ void MainWindow::setupToolActions()
       if (WidgetDatabase::group(i) != grp)
         continue;               // only widgets, i.e. not forms and temp stuff
       TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(),
-                                           this, TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1());
+                                           this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1());
       a->setExclusiveGroup("tool");
       TQString atext = WidgetDatabase::className(i);
       if (atext[0] == 'Q')
@@ -390,7 +390,7 @@ void MainWindow::setupToolActions()
           continue;
         TQString name = fi->baseName();
         name = name.replace("_", " ");
-        editMenu->insertItem(name, this, TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count());
+        editMenu->insertItem(name, this, TQ_SLOT(editExternalTool(int)), 0, m_editorTools.count());
         m_editorTools.append(fi->filePath());
       }
   }
@@ -410,54 +410,54 @@ void MainWindow::setupFileActions()
   fileMenu = new TQPopupMenu(this, "File");
   menuBar()->insertItem(i18n("&File"), fileMenu);
 
-  TDEAction *a = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+  TDEAction *a = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
   a->setToolTip(i18n("Creates a new dialog"));
   a->setWhatsThis(whatsThisFrom("File|New"));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  a = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+  a = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
   a->setToolTip(i18n("Opens an existing dialog"));
   a->setWhatsThis(whatsThisFrom("File|Open"));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  actionRecent = KStdAction::openRecent(this,  TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection());
+  actionRecent = KStdAction::openRecent(this,  TQ_SLOT(fileOpenRecent(const KURL&)), actionCollection());
   actionRecent->setToolTip(i18n("Opens recently open file"));
   actionRecent->plug(fileMenu);
 
   fileMenu->insertSeparator();
-  a = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection());
+  a = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection());
   a->setToolTip(i18n("Closes the current dialog"));
   a->setWhatsThis(whatsThisFrom("File|Close"));
-  connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool)));
   a->plug(fileMenu);
 
   fileMenu->insertSeparator();
 
-  a = KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
+  a = KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
   a->setToolTip(i18n("Saves the current dialog"));
   a->setWhatsThis(whatsThisFrom("File|Save"));
-  connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool)));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  a = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
+  a = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
   a->setToolTip(i18n("Saves the current dialog with a new filename"));
   a->setWhatsThis(whatsThisFrom("File|Save As"));
-  connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool)));
   a->plug(fileMenu);
 
-  a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQT_SLOT(fileSaveAll()),
+  a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQ_SLOT(fileSaveAll()),
                   actionCollection(), "file_close_all");
   a->setToolTip(i18n("Saves all open dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Save All"));
-  connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool)));
   a->plug(fileMenu);
 
   fileMenu->insertSeparator();
 
-  a = KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
+  a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
   a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Exit"));
   a->plug(fileMenu);
@@ -470,10 +470,10 @@ void MainWindow::setupRunActions()
   menuBar()->insertItem(i18n("&Run"), menu);
 
   TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R,
-                           this, TQT_SLOT(runForm()), actionCollection(), "run");
+                           this, TQ_SLOT(runForm()), actionCollection(), "run");
   a->setToolTip(i18n("Executes dialog"));
   a->setWhatsThis(whatsThisFrom("Run|Run dialog"));
-  connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool)));
+  connect(this, TQ_SIGNAL(hasActiveForm(bool)), a, TQ_SLOT(setEnabled(bool)));
   a->plug(fileTb);
   a->plug(menu);
 }
@@ -485,39 +485,39 @@ void MainWindow::setupWindowActions()
   {
     windowActionsSetup = true;
 
-    TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace,  TQT_SLOT(tile()),
+    TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace,  TQ_SLOT(tile()),
                                    actionCollection(), "window_tile");
     actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible"));
     actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile"));
 
-    TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace,  TQT_SLOT(cascade()),
+    TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace,  TQ_SLOT(cascade()),
                                       actionCollection(), "window_cascade");
     actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible"));
     actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade"));
 
-    TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace,  TQT_SLOT(closeActiveWindow()),
+    TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace,  TQ_SLOT(closeActiveWindow()),
                                     actionCollection(), "window_close");
     actionWindowClose->setToolTip(i18n("Closes the active window"));
     actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close"));
 
     TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), qworkspace, 
-                                       TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all");
+                                       TQ_SLOT(closeAllWindows()), actionCollection(), "window_close_all");
     actionWindowCloseAll->setToolTip(i18n("Closes all form windows"));
     actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All"));
 
     TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, qworkspace, 
-                                   TQT_SLOT(activateNextWindow()), actionCollection(), "window_next");
+                                   TQ_SLOT(activateNextWindow()), actionCollection(), "window_next");
     actionWindowNext->setToolTip(i18n("Activates the next window"));
     actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next"));
 
     TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace, 
-                                       TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev");
+                                       TQ_SLOT(activatePreviousWindow()), actionCollection(), "window_prev");
     actionWindowPrevious->setToolTip(i18n("Activates the previous window"));
     actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous"));
 
     windowMenu = new TDEPopupMenu(this, "Window");
     menuBar()->insertItem(i18n("&Window"), windowMenu);
-    connect(windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(setupWindowActions()));
+    connect(windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupWindowActions()));
 
     actionWindowClose->plug(windowMenu);
     actionWindowCloseAll->plug(windowMenu);
@@ -554,7 +554,7 @@ void MainWindow::setupWindowActions()
     else
       itemText += w->caption();
 
-    int id = windowMenu->insertItem(itemText, this, TQT_SLOT(windowsMenuActivated(int)));
+    int id = windowMenu->insertItem(itemText, this, TQ_SLOT(windowsMenuActivated(int)));
     windowMenu->setItemParameter(id, i);
     windowMenu->setItemChecked(id, qworkspace->activeWindow() == windows.at(i));
   }
@@ -564,21 +564,21 @@ void MainWindow::setupWindowActions()
 void MainWindow::setupSettingsActions()
 {
   TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings");
-  TDEAction* a = KStdAction::keyBindings(this, TQT_SLOT(editShortcuts()), actionCollection());
+  TDEAction* a = KStdAction::keyBindings(this, TQ_SLOT(editShortcuts()), actionCollection());
   a->setToolTip(i18n("Opens a dialog to change shortcuts"));
   a->plug(settings);
 
-  a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQT_SLOT(editPlugins()),
+  a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQ_SLOT(editPlugins()),
                   actionCollection(), "configure_plugins");
   a->setToolTip(i18n("Opens a dialog to configure plugins"));
   a->plug(settings);
 
-  a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQT_SLOT(configureEditor()),
+  a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQ_SLOT(configureEditor()),
                   actionCollection(), "configure_editor");
   a->setToolTip(i18n("Configure various aspects of this editor."));
   a->plug(settings);
 
-  a = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection());
+  a = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection());
   a->setToolTip(i18n("Opens a dialog to change preferences"));
   a->setWhatsThis(whatsThisFrom("Edit|Preferences"));
   a->plug(settings);
@@ -780,7 +780,7 @@ void MainWindow::fileCreateTemplate()
   }
 
   dia.editName->setText(i18n("NewTemplate"));
-  connect(dia.buttonCreate, TQT_SIGNAL(clicked()), this, TQT_SLOT(createNewTemplate()));
+  connect(dia.buttonCreate, TQ_SIGNAL(clicked()), this, TQ_SLOT(createNewTemplate()));
   dia.exec();
 }
 
@@ -1090,7 +1090,7 @@ void MainWindow::editPreferences()
   statusBar()->message(i18n("Edit preferences..."));
   Preferences *dia = new Preferences(this, 0, true);
   prefDia = dia;
-  connect(dia->helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp()));
+  connect(dia->helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp()));
   dia->buttonColor->setEditor(StyledButton::ColorEditor);
   dia->buttonPixmap->setEditor(StyledButton::PixmapEditor);
   dia->checkBoxShowGrid->setChecked(sGrid);
@@ -1111,7 +1111,7 @@ void MainWindow::editPreferences()
   dia->checkBoxSplash->setChecked(splashScreen);
   dia->editDocPath->setText(docPath);
   dia->checkAutoEdit->setChecked(!databaseAutoEdit);
-  connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseDocPath()));
+  connect(dia->buttonDocPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseDocPath()));
 
   if (dia->exec() == TQDialog::Accepted)
   {
@@ -1165,8 +1165,8 @@ void MainWindow::editExternalTool(int id)
 {
   TDEProcess* process = new TDEProcess;
   (*process) << "kmdr-executor" << m_editorTools[id];
-  connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*)));
-  connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int)));
+  connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editToolExited(TDEProcess*)));
+  connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(editToolOutput(TDEProcess*, char*, int)));
   m_toolOutput = '\0';
   process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }