Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 147 insertions, 147 deletions

diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index a4737821..90533c26 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -85,7 +85,7 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache
   setMouseTracking(true);
   setFocusPolicy(TQWidget::ClickFocus);
 
-  connect(&clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar()));
+  connect(&clearStatusBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearStatusBar()));
   setBackgroundMode(TQt::NoBackground);
 
   if (!busyIcon)
@@ -260,7 +260,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e)
     {
       // Request page pixmap.
       pixmapRequested = true;
-      TQTimer::singleShot(50, this, TQT_SLOT(delayedRequestPage()));
+      TQTimer::singleShot(50, this, TQ_SLOT(delayedRequestPage()));
     }
     return;
   }
@@ -367,7 +367,7 @@ void DocumentWidget::drawScrollGuide(int ycoord)
   //kdDebug() << "draw scroll guide for page " << pageNr << " at y = " << ycoord << endl;
   scrollGuide = ycoord;
   update(TQRect(1, scrollGuide, pageSize().width(), 1));
-  TQTimer::singleShot(1000, this, TQT_SLOT(clearScrollGuide()));
+  TQTimer::singleShot(1000, this, TQ_SLOT(clearScrollGuide()));
 }
 
 void DocumentWidget::clearScrollGuide()
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index aec9a7c5..a370bc76 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -68,7 +68,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   setInstance(KViewPartFactory::instance());
 
   watch = KDirWatch::self();
-  connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&)));
+  connect(watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(fileChanged(const TQString&)));
   watch->startScan();
 
   mainWidget = new TQHBox(parentWidget, widgetName);
@@ -83,7 +83,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   // Without this the GUI-items of the KMultiPages are not merged
   partManager->setAllowNestedParts(true);
 
-  connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*)));
+  connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*)));
   partManager->addPart(this);
 
   // create the displaying part
@@ -170,28 +170,28 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   // Add the multipage to the GUI.
   partManager->addPart(multiPage);
 
-  exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text");
+  exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQ_SLOT(mp_exportText()), actionCollection(), "export_text");
 
   // edit menu
-  findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find");
-  findNextAction = KStdAction::findNext(this, TQT_SLOT(mp_findNextText()), actionCollection(), "findnext");
+  findTextAction = KStdAction::find(this, TQ_SLOT(mp_showFindTextDialog()), actionCollection(), "find");
+  findNextAction = KStdAction::findNext(this, TQ_SLOT(mp_findNextText()), actionCollection(), "findnext");
   findNextAction->setEnabled(false);
-  findPrevAction = KStdAction::findPrev(this, TQT_SLOT(mp_findPrevText()), actionCollection(), "findprev");
+  findPrevAction = KStdAction::findPrev(this, TQ_SLOT(mp_findPrevText()), actionCollection(), "findprev");
   findPrevAction->setEnabled(false);
 
-  selectAllAction = KStdAction::selectAll(this, TQT_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all");
+  selectAllAction = KStdAction::selectAll(this, TQ_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all");
 
-  copyTextAction = KStdAction::copy(this, TQT_SLOT(mp_copyText()), actionCollection(), "copy_text");
+  copyTextAction = KStdAction::copy(this, TQ_SLOT(mp_copyText()), actionCollection(), "copy_text");
   copyTextAction->setEnabled(false);
 
-  deselectAction = KStdAction::deselect(this, TQT_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all");
+  deselectAction = KStdAction::deselect(this, TQ_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all");
   deselectAction->setEnabled(false);
 
-  saveAction = KStdAction::save(this, TQT_SLOT(mp_slotSave_defaultFilename()), actionCollection());
+  saveAction = KStdAction::save(this, TQ_SLOT(mp_slotSave_defaultFilename()), actionCollection());
 
   // settings menu
   showSidebar = new TDEToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this,
-                                   TQT_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar");
+                                   TQ_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar");
   showSidebar->setCheckedState(i18n("Hide &Sidebar"));
   watchAct = new TDEToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file");
   scrollbarHandling = new TDEToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling");
@@ -212,17 +212,17 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   orientations.append(i18n("Landscape"));
   orientation = new TDESelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation");
   orientation->setItems(orientations);
-  connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int)));
+  connect(orientation, TQ_SIGNAL(activated (int)), &userRequestedPaperSize, TQ_SLOT(setOrientation(int)));
 
   // Zoom Menu
   zoom_action = new TDESelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom");
   zoom_action->setEditable(true);
   zoom_action->setItems(_zoomVal.zoomNames());
 
-  connect (&_zoomVal, TQT_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQT_SLOT(setItems(const TQStringList &)));
-  connect (&_zoomVal, TQT_SIGNAL(valNoChanged(int)), zoom_action, TQT_SLOT(setCurrentItem(int)));
-  connect (&_zoomVal, TQT_SIGNAL(zoomNameChanged(const TQString &)), this, TQT_SIGNAL(zoomChanged(const TQString &)) );
-  connect (zoom_action, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setZoomValue(const TQString &)));
+  connect (&_zoomVal, TQ_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQ_SLOT(setItems(const TQStringList &)));
+  connect (&_zoomVal, TQ_SIGNAL(valNoChanged(int)), zoom_action, TQ_SLOT(setCurrentItem(int)));
+  connect (&_zoomVal, TQ_SIGNAL(zoomNameChanged(const TQString &)), this, TQ_SIGNAL(zoomChanged(const TQString &)) );
+  connect (zoom_action, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setZoomValue(const TQString &)));
   _zoomVal.setZoomValue(1.0); // should not be necessary @@@@
   emit(zoomChanged("100%"));
 
@@ -231,14 +231,14 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   TQStringList items = userRequestedPaperSize.pageSizeNames();
   items.prepend(i18n("Custom Size..."));
   media->setItems(items);
-  connect (media, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMedia(int)));
+  connect (media, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMedia(int)));
 
-  useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()),
+  useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQ_SLOT(slotShowSidebar()),
 					       actionCollection(), "view_use_document_specified_size");
 
   // Zoom Actions
-  zoomInAct = KStdAction::zoomIn (this, TQT_SLOT(zoomIn()), actionCollection());
-  zoomOutAct = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection());
+  zoomInAct = KStdAction::zoomIn (this, TQ_SLOT(zoomIn()), actionCollection());
+  zoomOutAct = KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection());
 
   fitPageAct = new TDEToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P,
                                  actionCollection(), "view_fit_to_page");
@@ -251,24 +251,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   fitWidthAct -> setExclusiveGroup("view_fit");
   fitHeightAct -> setExclusiveGroup("view_fit");
 
-  connect(fitPageAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToPage(bool)));
-  connect(fitWidthAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToWidth(bool)));
-  connect(fitHeightAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToHeight(bool)));
+  connect(fitPageAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToPage(bool)));
+  connect(fitWidthAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToWidth(bool)));
+  connect(fitHeightAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToHeight(bool)));
 
   // go menu
-  backAct = KStdAction::prior(this, TQT_SLOT(mp_prevPage()), actionCollection());
-  forwardAct = KStdAction::next(this, TQT_SLOT(mp_nextPage()), actionCollection());
-  startAct = KStdAction::firstPage(this, TQT_SLOT(mp_firstPage()), actionCollection());
-  endAct = KStdAction::lastPage(this, TQT_SLOT(mp_lastPage()), actionCollection());
-  gotoAct = KStdAction::gotoPage(this, TQT_SLOT(goToPage()), actionCollection());
+  backAct = KStdAction::prior(this, TQ_SLOT(mp_prevPage()), actionCollection());
+  forwardAct = KStdAction::next(this, TQ_SLOT(mp_nextPage()), actionCollection());
+  startAct = KStdAction::firstPage(this, TQ_SLOT(mp_firstPage()), actionCollection());
+  endAct = KStdAction::lastPage(this, TQ_SLOT(mp_lastPage()), actionCollection());
+  gotoAct = KStdAction::gotoPage(this, TQ_SLOT(goToPage()), actionCollection());
   gotoAct->setShortcut("CTRL+G");
 
-  readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up");
-  readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down");
+  readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQ_SLOT(mp_readUp()), actionCollection(), "go_read_up");
+  readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQ_SLOT(mp_readDown()), actionCollection(), "go_read_down");
 
-  printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection());
+  printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection());
 
-  saveAsAction = KStdAction::saveAs(this, TQT_SLOT(mp_slotSave()), actionCollection());
+  saveAsAction = KStdAction::saveAs(this, TQ_SLOT(mp_slotSave()), actionCollection());
 
   // mode action
   moveModeAction = new TDERadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool");
@@ -279,20 +279,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
 
   moveModeAction->setChecked(true);
 
-  connect(moveModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMoveTool(bool)));
-  //connect(selectionModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSelectionTool(bool)));
+  connect(moveModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMoveTool(bool)));
+  //connect(selectionModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSelectionTool(bool)));
 
   // history action
   backAction = new TDEAction(i18n("&Back"), "1leftarrow", 0,
-                   this, TQT_SLOT(mp_doGoBack()), actionCollection(), "go_back");
+                   this, TQ_SLOT(mp_doGoBack()), actionCollection(), "go_back");
   forwardAction = new TDEAction(i18n("&Forward"), "1rightarrow", 0,
-                      this, TQT_SLOT(mp_doGoForward()), actionCollection(), "go_forward");
+                      this, TQ_SLOT(mp_doGoForward()), actionCollection(), "go_forward");
 
   backAction->setEnabled(false);
   forwardAction->setEnabled(false);
 
 
-  settingsAction = KStdAction::preferences(this, TQT_SLOT(doSettings()), actionCollection());
+  settingsAction = KStdAction::preferences(this, TQ_SLOT(doSettings()), actionCollection());
 
   // We only show this menuitem if no default mimetype is set. This usually means kviewshell
   // has been started by itself. Otherwise if KDVI or KFaxView has been started show the
@@ -300,20 +300,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   if (!args.isEmpty())
   {
     aboutAction = new TDEAction(i18n("About KViewShell"), "kviewshell", 0, this,
-                            TQT_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell");
+                            TQ_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell");
   }
 
   // keyboard accelerators
   accel = new TDEAccel(mainWidget);
-  accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQT_SLOT(mp_scrollUp()));
-  accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQT_SLOT(mp_scrollDown()));
-  accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQT_SLOT(mp_scrollLeft()));
-  accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQT_SLOT(mp_scrollRight()));
+  accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQ_SLOT(mp_scrollUp()));
+  accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQ_SLOT(mp_scrollDown()));
+  accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQ_SLOT(mp_scrollLeft()));
+  accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQ_SLOT(mp_scrollRight()));
 
-  accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQT_SLOT(mp_scrollUpPage()));
-  accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQT_SLOT(mp_scrollDownPage()));
-  accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQT_SLOT(mp_scrollLeftPage()));
-  accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQT_SLOT(mp_scrollRightPage()));
+  accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQ_SLOT(mp_scrollUpPage()));
+  accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQ_SLOT(mp_scrollDownPage()));
+  accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQ_SLOT(mp_scrollLeftPage()));
+  accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQ_SLOT(mp_scrollRightPage()));
 
   accel->readSettings();
   readSettings();
@@ -333,7 +333,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
 
   // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess
   // with our menus.
-  disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*)));
+  disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*)));
 }
 
 KViewPart::~KViewPart()
@@ -360,41 +360,41 @@ void KViewPart::initializeMultiPage()
   // Paper Size handling
   multiPage->setUseDocumentSpecifiedSize(useDocumentSpecifiedSize->isChecked());
   multiPage->setUserPreferredSize(userRequestedPaperSize);
-  connect(&userRequestedPaperSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQT_SLOT(setUserPreferredSize(const SimplePageSize&)));
-  connect(useDocumentSpecifiedSize, TQT_SIGNAL(toggled(bool)), multiPage, TQT_SLOT(setUseDocumentSpecifiedSize(bool)));
+  connect(&userRequestedPaperSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQ_SLOT(setUserPreferredSize(const SimplePageSize&)));
+  connect(useDocumentSpecifiedSize, TQ_SIGNAL(toggled(bool)), multiPage, TQ_SLOT(setUseDocumentSpecifiedSize(bool)));
 
 
-  connect(scrollbarHandling, TQT_SIGNAL(toggled(bool)),  multiPage, TQT_SLOT(slotShowScrollbars(bool)));
+  connect(scrollbarHandling, TQ_SIGNAL(toggled(bool)),  multiPage, TQ_SLOT(slotShowScrollbars(bool)));
 
   // connect to the multi page view
-  connect( this, TQT_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool)));
-  connect( multiPage, TQT_SIGNAL(pageInfo(int, int)), this, TQT_SLOT(pageInfo(int, int)) );
-  connect( multiPage, TQT_SIGNAL(askingToCheckActions()), this, TQT_SLOT(checkActions()) );
-  connect( multiPage, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SIGNAL( started( TDEIO::Job * ) ) );
-  connect( multiPage, TQT_SIGNAL( completed() ), this, TQT_SIGNAL( completed() ) );
-  connect( multiPage, TQT_SIGNAL( canceled( const TQString & ) ), this, TQT_SIGNAL( canceled( const TQString & ) ) );
-  connect( multiPage, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) );
+  connect( this, TQ_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQ_SLOT(slotShowScrollbars(bool)));
+  connect( multiPage, TQ_SIGNAL(pageInfo(int, int)), this, TQ_SLOT(pageInfo(int, int)) );
+  connect( multiPage, TQ_SIGNAL(askingToCheckActions()), this, TQ_SLOT(checkActions()) );
+  connect( multiPage, TQ_SIGNAL( started( TDEIO::Job * ) ), this, TQ_SIGNAL( started( TDEIO::Job * ) ) );
+  connect( multiPage, TQ_SIGNAL( completed() ), this, TQ_SIGNAL( completed() ) );
+  connect( multiPage, TQ_SIGNAL( canceled( const TQString & ) ), this, TQ_SIGNAL( canceled( const TQString & ) ) );
+  connect( multiPage, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) );
 
-  connect( multiPage, TQT_SIGNAL(zoomIn()), this, TQT_SLOT(zoomIn()) );
-  connect( multiPage, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(zoomOut()) );
+  connect( multiPage, TQ_SIGNAL(zoomIn()), this, TQ_SLOT(zoomIn()) );
+  connect( multiPage, TQ_SIGNAL(zoomOut()), this, TQ_SLOT(zoomOut()) );
 
   // change the viewmode
-  connect(viewModeAction, TQT_SIGNAL(activated (int)), multiPage, TQT_SLOT(setViewMode(int)));
+  connect(viewModeAction, TQ_SIGNAL(activated (int)), multiPage, TQ_SLOT(setViewMode(int)));
 
   // Update zoomlevel on viewmode changes
-  connect(multiPage, TQT_SIGNAL(viewModeChanged()), this, TQT_SLOT(updateZoomLevel()));
+  connect(multiPage, TQ_SIGNAL(viewModeChanged()), this, TQ_SLOT(updateZoomLevel()));
 
   // navigation history
-  connect(multiPage->history(), TQT_SIGNAL(backItem(bool)), backAction, TQT_SLOT(setEnabled(bool)));
-  connect(multiPage->history(), TQT_SIGNAL(forwardItem(bool)), forwardAction, TQT_SLOT(setEnabled(bool)));
+  connect(multiPage->history(), TQ_SIGNAL(backItem(bool)), backAction, TQ_SLOT(setEnabled(bool)));
+  connect(multiPage->history(), TQ_SIGNAL(forwardItem(bool)), forwardAction, TQ_SLOT(setEnabled(bool)));
 
   // text selection
-  connect(multiPage, TQT_SIGNAL(textSelected(bool)), copyTextAction, TQT_SLOT(setEnabled(bool)));
-  connect(multiPage, TQT_SIGNAL(textSelected(bool)), deselectAction, TQT_SLOT(setEnabled(bool)));
+  connect(multiPage, TQ_SIGNAL(textSelected(bool)), copyTextAction, TQ_SLOT(setEnabled(bool)));
+  connect(multiPage, TQ_SIGNAL(textSelected(bool)), deselectAction, TQ_SLOT(setEnabled(bool)));
 
   // text search
-  connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findNextAction, TQT_SLOT(setEnabled(bool)));
-  connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findPrevAction, TQT_SLOT(setEnabled(bool)));
+  connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findNextAction, TQ_SLOT(setEnabled(bool)));
+  connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findPrevAction, TQ_SLOT(setEnabled(bool)));
 
   // allow parts to have a GUI, too :-)
   // (will be merged automatically)
@@ -845,7 +845,7 @@ bool KViewPart::openFile()
     // Remember the name of the part. So only need to switch if really necessary.
     multiPageLibrary = service->library();
 
-    connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*)));
+    connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*)));
 
     // Switch to the new multiPage
     partManager->replacePart(oldMultiPage, multiPage);
@@ -862,7 +862,7 @@ bool KViewPart::openFile()
 
     // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess
     // with our menus.
-    disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*)));
+    disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*)));
 
     readSettings();
   }
@@ -1083,15 +1083,15 @@ void KViewPart::enableFitToPage(bool enable)
   if (enable)
   {
     fitToPage();
-    connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-            this, TQT_SLOT(slotStartFitTimer()));
-    connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToPage()));
+    connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+            this, TQ_SLOT(slotStartFitTimer()));
+    connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToPage()));
   }
   else
   {
-    disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-               this, TQT_SLOT(slotStartFitTimer()));
-    disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToPage()));
+    disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+               this, TQ_SLOT(slotStartFitTimer()));
+    disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToPage()));
   }
 }
 
@@ -1100,15 +1100,15 @@ void KViewPart::enableFitToWidth(bool enable)
   if (enable)
   {
     fitToWidth();
-    connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-            this, TQT_SLOT(slotStartFitTimer()));
-    connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToWidth()));
+    connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+            this, TQ_SLOT(slotStartFitTimer()));
+    connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToWidth()));
   }
   else
   {
-    disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-               this, TQT_SLOT(slotStartFitTimer()));
-    disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToWidth()));
+    disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+               this, TQ_SLOT(slotStartFitTimer()));
+    disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToWidth()));
   }
 }
 
@@ -1117,15 +1117,15 @@ void KViewPart::enableFitToHeight(bool enable)
   if (enable)
   {
     fitToHeight();
-    connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-            this, TQT_SLOT(slotStartFitTimer()));
-    connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToHeight()));
+    connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+            this, TQ_SLOT(slotStartFitTimer()));
+    connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToHeight()));
   }
   else
   {
-    disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)),
-               this, TQT_SLOT(slotStartFitTimer()));
-    disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToHeight()));
+    disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)),
+               this, TQ_SLOT(slotStartFitTimer()));
+    disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToHeight()));
   }
 }
 
@@ -1460,7 +1460,7 @@ void KViewPart::doSettings()
 
   multiPage->addConfigDialogs(configDialog);
 
-  connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(preferencesChanged()));
+  connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(preferencesChanged()));
   configDialog->show();
 }
 
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 69641150..12d56b73 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -73,33 +73,33 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   setCentralWidget(view->widget());
 
   // file menu
-  KStdAction::open(view, TQT_SLOT(slotFileOpen()), actionCollection());
-  recent = KStdAction::openRecent (this, TQT_SLOT(openURL(const KURL &)), actionCollection());
-  reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload");
-  closeAction = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
-  KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection());
+  KStdAction::open(view, TQ_SLOT(slotFileOpen()), actionCollection());
+  recent = KStdAction::openRecent (this, TQ_SLOT(openURL(const KURL &)), actionCollection());
+  reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQ_SLOT(reload()), actionCollection(), "reload");
+  closeAction = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection());
+  KStdAction::quit (this, TQ_SLOT(slotQuit()), actionCollection());
 
-  connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile()));
+  connect(view, TQ_SIGNAL(fileOpened()), this, TQ_SLOT(addRecentFile()));
 
   // view menu
-  fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
+  fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
 
   // settings menu
   createStandardStatusBarAction();
 
   setStandardToolBarMenuEnabled(true);
 
-  KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbar()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbar()), actionCollection());
 
   // statusbar connects
-  connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) );
-  connect( view, TQT_SIGNAL( pageChanged(const TQString &) ), this,TQT_SLOT( slotChangePageText(const TQString &) ) );
-  connect( view, TQT_SIGNAL( sizeChanged(const TQString &) ), this,TQT_SLOT( slotChangeSizeText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( zoomChanged(const TQString &) ), this,TQ_SLOT( slotChangeZoomText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( pageChanged(const TQString &) ), this,TQ_SLOT( slotChangePageText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( sizeChanged(const TQString &) ), this,TQ_SLOT( slotChangeSizeText(const TQString &) ) );
 
   // Setup session management
-  connect( this, TQT_SIGNAL( restoreDocument(const KURL &, int) ), view, TQT_SLOT( restoreDocument(const KURL &, int)));
-  connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
+  connect( this, TQ_SIGNAL( restoreDocument(const KURL &, int) ), view, TQ_SLOT( restoreDocument(const KURL &, int)));
+  connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
 
   setXMLFile( "kviewshell.rc" );
   createGUI(view);
@@ -120,7 +120,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   statusBar()->changeItem("", StatusBar_ID_Zoom);
   statusBar()->insertItem(view->pageSizeDescription(), StatusBar_ID_PageSize, 0, true);
 
-  connect( view, TQT_SIGNAL(pluginChanged(KParts::Part*)), this, TQT_SLOT(createGUI(KParts::Part*)));
+  connect( view, TQ_SIGNAL(pluginChanged(KParts::Part*)), this, TQ_SLOT(createGUI(KParts::Part*)));
 }
 
 
@@ -290,7 +290,7 @@ void KViewShell::slotEditToolbar()
 {
   saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
   KEditToolbar dlg(factory());
-  connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) );
   dlg.exec();
 }
 
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 799b5eea..0d895df3 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -108,7 +108,7 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e)
     // TODO: Disable or find something less distractiong.
     p.drawPixmap(10, 10, *waitIcon);
 
-    TQTimer::singleShot(50, this, TQT_SLOT(setThumbnail()));
+    TQTimer::singleShot(50, this, TQ_SLOT(setThumbnail()));
     return;
   }
 
@@ -325,8 +325,8 @@ void MarkList::setNumberOfPages(int numberOfPages, bool _showThumbnails)
   {
     MarkListWidget* item = new MarkListWidget(viewport(), this, page, pageCache, showThumbnails);
 
-    connect(item, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(thumbnailSelected(const PageNumber&)));
-    connect(item, TQT_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQT_SLOT(showPopupMenu(const PageNumber&, const TQPoint&)));
+    connect(item, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(thumbnailSelected(const PageNumber&)));
+    connect(item, TQ_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQ_SLOT(showPopupMenu(const PageNumber&, const TQPoint&)));
 
     widgetList.insert(page - 1, item);
 
diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp
index 9c6d387d..b9fd432b 100644
--- a/kviewshell/pageSizeWidget.cpp
+++ b/kviewshell/pageSizeWidget.cpp
@@ -26,7 +26,7 @@
 pageSizeWidget::pageSizeWidget( TQWidget* parent,  const char* name, WFlags fl )
     : pageSizeWidget_base( parent,  name, fl )
 {
-  connect(&chosenSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQT_SLOT(setSize(const SimplePageSize&)));
+  connect(&chosenSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQ_SLOT(setSize(const SimplePageSize&)));
 
   // Set up the formatChoice TQComboBox
   formatChoice->insertItem(i18n("Custom Size"));
@@ -42,17 +42,17 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent,  const char* name, WFlags fl )
   }
   paperSize(formatChoice->currentItem());
 
-  connect(formatChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paperSize(int)));
-  connect(orientationChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(orientationChanged(int)));
+  connect(formatChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(paperSize(int)));
+  connect(orientationChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(orientationChanged(int)));
 
   // Update the text fields when the user switches to a new unit, and
   // when the "custom format" is NOT selected.
-  connect(widthUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int)));
-  connect(heightUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int)));
+  connect(widthUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int)));
+  connect(heightUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int)));
 
   // Upate the chosen size whenever the user edits the input field. 
-  connect(widthInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &)));
-  connect(heightInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &)));
+  connect(widthInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &)));
+  connect(heightInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &)));
 
   // Allow entries between 0 and 1200. More filtering is done by the
   // pageSize class, which silently ignores values which are out of
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index c651b0b6..028522f1 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -54,7 +54,7 @@ PageView::PageView( TQWidget* parent, const char* name )
   continuousViewmode = true;
   fullScreen = false;
 
-  connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(calculateCurrentPageNumber(int, int)));
+  connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(calculateCurrentPageNumber(int, int)));
 }
 
 
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index ae1ab9f6..8cfde527 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -67,10 +67,10 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
 
   renderModeAction->setCurrentItem(Prefs::renderMode());
 
-  deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages");
+  deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQ_SLOT(slotDeletePages()), actionCollection(), "delete_pages");
 
   // change the rendermode
-  connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int)));
+  connect(renderModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setRenderMode(int)));
 
   /* It is very important that this method is called in the
      constructor. Otherwise tdemultipage does not know how to render
diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp
index 1d5c7be1..4acd8294 100644
--- a/kviewshell/plugins/djvu/pageRangeWidget.cpp
+++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp
@@ -41,8 +41,8 @@ PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _cur
     _current = _to;
   }
 
-  connect(from, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fromValueChanged(int)));
-  connect(to, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(toValueChanged(int)));
+  connect(from, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(fromValueChanged(int)));
+  connect(to, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(toValueChanged(int)));
 
   from->setRange(_from, _to);
   from->setValue(_current);
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index a753ec45..cd971934 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -72,12 +72,12 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
   caseSensitiveCheckBox->setText(i18n("Case sensitive"));
   layout->addWidget(caseSensitiveCheckBox);
 
-  connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch()));
+  connect(stopButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(stopSearch()));
 
-  connect(findNextButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNextText()));
-  connect(findPrevButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findPrevText()));
+  connect(findNextButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNextText()));
+  connect(findPrevButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findPrevText()));
 
-  connect(searchText, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged()));
+  connect(searchText, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged()));
 
   textChanged();
 }
diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp
index 82862d14..e5e54598 100644
--- a/kviewshell/tableOfContents.cpp
+++ b/kviewshell/tableOfContents.cpp
@@ -55,7 +55,7 @@ TableOfContents::TableOfContents(TQWidget* parent)
 
   readSettings();
 
-  connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemClicked(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemClicked(TQListViewItem*)));
 }
 
 TableOfContents::~TableOfContents()
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index d1f3fc87..49294609 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -63,7 +63,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
   tableOfContents = new TableOfContents(sideBar);
   sideBar->addItem(tableOfContents, TQIconSet(SmallIcon("contents")), i18n("Contents"));
 
-  connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&)));
+  connect(tableOfContents, TQ_SIGNAL(gotoPage(const Anchor&)), this, TQ_SLOT(gotoPage(const Anchor&)));
   
   // Create MarkList
   _markList = new MarkList(sideBar, "marklist");
@@ -74,30 +74,30 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
 
   splitterWidget->setResizeMode(sideBar, TQSplitter::KeepSize);
 
-  connect(_markList, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(gotoPage(const PageNumber&)));
+  connect(_markList, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(gotoPage(const PageNumber&)));
 
   _scrollView = new PageView(splitterWidget, widgetName);
 
   // Create Search Panel
   searchWidget = new SearchWidget(verticalBox);
   searchWidget->hide();
-  connect(searchWidget, TQT_SIGNAL(findNextText()), this, TQT_SLOT(findNextText()));
-  connect(searchWidget, TQT_SIGNAL(findPrevText()), this, TQT_SLOT(findPrevText()));
+  connect(searchWidget, TQ_SIGNAL(findNextText()), this, TQ_SLOT(findNextText()));
+  connect(searchWidget, TQ_SIGNAL(findPrevText()), this, TQ_SLOT(findPrevText()));
 
   sideBar->setMinimumWidth(80);
   sideBar->setMaximumWidth(300);
 
-  connect(_scrollView, TQT_SIGNAL(currentPageChanged(const PageNumber&)), this, TQT_SLOT(setCurrentPageNumber(const PageNumber&)));
-  connect(_scrollView, TQT_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQT_SLOT(calculateCurrentPageNumber()));
-  connect(_scrollView, TQT_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQT_SLOT(wheelEvent(TQWheelEvent*)));
+  connect(_scrollView, TQ_SIGNAL(currentPageChanged(const PageNumber&)), this, TQ_SLOT(setCurrentPageNumber(const PageNumber&)));
+  connect(_scrollView, TQ_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQ_SLOT(calculateCurrentPageNumber()));
+  connect(_scrollView, TQ_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQ_SLOT(wheelEvent(TQWheelEvent*)));
 
-  connect(this, TQT_SIGNAL(enableMoveTool(bool)), _scrollView, TQT_SLOT(slotEnableMoveTool(bool)));
+  connect(this, TQ_SIGNAL(enableMoveTool(bool)), _scrollView, TQ_SLOT(slotEnableMoveTool(bool)));
 
   splitterWidget->setCollapsible(sideBar, false);
   splitterWidget->setSizes(KVSPrefs::guiLayout());
 
-  connect(searchWidget, TQT_SIGNAL(searchEnabled(bool)), this, TQT_SIGNAL(searchEnabled(bool)));
-  connect(searchWidget, TQT_SIGNAL(stopSearch()), this, TQT_SLOT(stopSearch()));
+  connect(searchWidget, TQ_SIGNAL(searchEnabled(bool)), this, TQ_SIGNAL(searchEnabled(bool)));
+  connect(searchWidget, TQ_SIGNAL(stopSearch()), this, TQ_SLOT(stopSearch()));
 }
 
 
@@ -173,7 +173,7 @@ void KMultiPage::slotSave()
   }
 
   TDEIO::Job *job = TDEIO::file_copy( KURL( m_file ), KURL( fileName ), 0600, true, false, true );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) );
 
   return;
 }
@@ -352,8 +352,8 @@ void KMultiPage::initializePageCache()
 DocumentWidget* KMultiPage::createDocumentWidget()
 {
   DocumentWidget* documentWidget = new DocumentWidget(scrollView()->viewport(), scrollView(), pageCache, "singlePageWidget");
-  connect(documentWidget, TQT_SIGNAL(clearSelection()), this, TQT_SLOT(clearSelection()));
-  connect(this, TQT_SIGNAL(enableMoveTool(bool)), documentWidget, TQT_SLOT(slotEnableMoveTool(bool)));
+  connect(documentWidget, TQ_SIGNAL(clearSelection()), this, TQ_SLOT(clearSelection()));
+  connect(this, TQ_SIGNAL(enableMoveTool(bool)), documentWidget, TQ_SLOT(slotEnableMoveTool(bool)));
   return documentWidget;
 }
 
@@ -436,8 +436,8 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage)
       widgetList.insert(i, documentWidget);
       documentWidget->show();
 
-      connect(documentWidget, TQT_SIGNAL(localLink(const TQString &)), this, TQT_SLOT(handleLocalLink(const TQString &)));
-      connect(documentWidget, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)) );
+      connect(documentWidget, TQ_SIGNAL(localLink(const TQString &)), this, TQ_SLOT(handleLocalLink(const TQString &)));
+      connect(documentWidget, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&)) );
     }
   }
 
@@ -868,11 +868,11 @@ void KMultiPage::setRenderer(DocumentRenderer* _renderer)
   widgetList.resize(0);
 
   // Relay signals.
-  connect(renderer, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
-  connect(pageCache, TQT_SIGNAL(paperSizeChanged()), this, TQT_SLOT(renderModeChanged()));
-  connect(pageCache, TQT_SIGNAL(textSelected(bool)), this, TQT_SIGNAL(textSelected(bool)));
-  connect(renderer, TQT_SIGNAL(documentIsChanged()), this, TQT_SLOT(renderModeChanged()));
-  connect(this, TQT_SIGNAL(zoomChanged()), this, TQT_SLOT(repaintAllVisibleWidgets()));
+  connect(renderer, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&)));
+  connect(pageCache, TQ_SIGNAL(paperSizeChanged()), this, TQ_SLOT(renderModeChanged()));
+  connect(pageCache, TQ_SIGNAL(textSelected(bool)), this, TQ_SIGNAL(textSelected(bool)));
+  connect(renderer, TQ_SIGNAL(documentIsChanged()), this, TQ_SLOT(renderModeChanged()));
+  connect(this, TQ_SIGNAL(zoomChanged()), this, TQ_SLOT(repaintAllVisibleWidgets()));
 }