From 55cef714419f6e36e66dc75afc40682ea5c73a35 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:18 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- kolourpaint/kpmainwindow_edit.cpp | 20 ++++++++++---------- kolourpaint/kpmainwindow_file.cpp | 30 +++++++++++++++--------------- kolourpaint/kpmainwindow_help.cpp | 4 ++-- kolourpaint/kpmainwindow_image.cpp | 22 +++++++++++----------- kolourpaint/kpmainwindow_settings.cpp | 10 +++++----- kolourpaint/kpmainwindow_text.cpp | 12 ++++++------ kolourpaint/kpmainwindow_tools.cpp | 8 ++++---- kolourpaint/kpmainwindow_view.cpp | 30 +++++++++++++++--------------- 8 files changed, 68 insertions(+), 68 deletions(-) (limited to 'kolourpaint') diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 61cb7319..dd62bcda 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -103,25 +103,25 @@ void kpMainWindow::setupEditMenuActions () } - m_actionCut = KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT (slotCut ()), ac); - m_actionCopy = KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT (slotCopy ()), ac); - m_actionPaste = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (slotPaste ()), ac); + m_actionCut = KStdAction::cut (this, TQT_SLOT (slotCut ()), ac); + m_actionCopy = KStdAction::copy (this, TQT_SLOT (slotCopy ()), ac); + m_actionPaste = KStdAction::paste (this, TQT_SLOT (slotPaste ()), ac); m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"), TQt::CTRL + TQt::SHIFT + TQt::Key_V, - TQT_TQOBJECT(this), TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); + this, TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac); m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotDelete ()), ac, "edit_clear"); + this, TQT_SLOT (slotDelete ()), ac, "edit_clear"); - m_actionSelectAll = KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT (slotSelectAll ()), ac); - m_actionDeselect = KStdAction::deselect (TQT_TQOBJECT(this), TQT_SLOT (slotDeselect ()), ac); + m_actionSelectAll = KStdAction::selectAll (this, TQT_SLOT (slotSelectAll ()), ac); + m_actionDeselect = KStdAction::deselect (this, TQT_SLOT (slotDeselect ()), ac); m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); + this, TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); + this, TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); m_editMenuDocumentActionsEnabled = false; @@ -130,7 +130,7 @@ void kpMainWindow::setupEditMenuActions () // Paste should always be enabled, as long as there is something paste // (independent of whether we have a document or not) connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()), - TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ())); + this, TQT_SLOT (slotEnablePaste ())); slotEnablePaste (); } diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index bc408f2c..25834797 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -67,41 +67,41 @@ void kpMainWindow::setupFileMenuActions () #endif TDEActionCollection *ac = actionCollection (); - m_actionNew = KStdAction::openNew (TQT_TQOBJECT(this), TQT_SLOT (slotNew ()), ac); - m_actionOpen = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (slotOpen ()), ac); + m_actionNew = KStdAction::openNew (this, TQT_SLOT (slotNew ()), ac); + m_actionOpen = KStdAction::open (this, TQT_SLOT (slotOpen ()), ac); - m_actionOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT (slotOpenRecent (const KURL &)), ac); + m_actionOpenRecent = KStdAction::openRecent (this, TQT_SLOT (slotOpenRecent (const KURL &)), ac); m_actionOpenRecent->loadEntries (kapp->config ()); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\trecent URLs=" << m_actionOpenRecent->items () << endl; #endif - m_actionSave = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT (slotSave ()), ac); - m_actionSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac); + m_actionSave = KStdAction::save (this, TQT_SLOT (slotSave ()), ac); + m_actionSaveAs = KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac); m_actionExport = new TDEAction (i18n ("E&xport..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotExport ()), ac, "file_export"); + this, TQT_SLOT (slotExport ()), ac, "file_export"); m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotScan ()), ac, "file_scan"); + this, TQT_SLOT (slotScan ()), ac, "file_scan"); //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac); m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (), - TQT_TQOBJECT(this), TQT_SLOT (slotReload ()), ac, "file_revert"); + this, TQT_SLOT (slotReload ()), ac, "file_revert"); slotEnableReload (); - m_actionPrint = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT (slotPrint ()), ac); - m_actionPrintPreview = KStdAction::printPreview (TQT_TQOBJECT(this), TQT_SLOT (slotPrintPreview ()), ac); + m_actionPrint = KStdAction::print (this, TQT_SLOT (slotPrint ()), ac); + m_actionPrintPreview = KStdAction::printPreview (this, TQT_SLOT (slotPrintPreview ()), ac); - m_actionMail = KStdAction::mail (TQT_TQOBJECT(this), TQT_SLOT (slotMail ()), ac); + m_actionMail = KStdAction::mail (this, TQT_SLOT (slotMail ()), ac); m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); + this, TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); + this, TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); - m_actionClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotClose ()), ac); - m_actionQuit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotQuit ()), ac); + m_actionClose = KStdAction::close (this, TQT_SLOT (slotClose ()), ac); + m_actionQuit = KStdAction::quit (this, TQT_SLOT (slotQuit ()), ac); m_scanDialog = 0; diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp index db2a9b01..7b4488fa 100644 --- a/kolourpaint/kpmainwindow_help.cpp +++ b/kolourpaint/kpmainwindow_help.cpp @@ -57,7 +57,7 @@ void kpMainWindow::setupHelpMenuActions () // -- Thurston d->m_actionHelpTakingScreenshots = new TDEAction ( i18n ("Acquiring &Screenshots"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshots ()), + this, TQT_SLOT (slotHelpTakingScreenshots ()), ac, "help_taking_screenshots"); @@ -188,7 +188,7 @@ void kpMainWindow::slotHelpTakingScreenshots () disconnect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), messageLabel, TQT_SLOT (openLink (const TQString &))); connect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); + this, TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); dlg.setMainWidget (messageLabel); diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp index cb3bca73..533b11f9 100644 --- a/kolourpaint/kpmainwindow_image.cpp +++ b/kolourpaint/kpmainwindow_image.cpp @@ -90,37 +90,37 @@ void kpMainWindow::setupImageMenuActions () TDEActionCollection *ac = actionCollection (); m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E, - TQT_TQOBJECT(this), TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale"); + this, TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale"); m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T, - TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop"); + this, TQT_SLOT (slotCrop ()), ac, "image_crop"); m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U, - TQT_TQOBJECT(this), TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); + this, TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F, - TQT_TQOBJECT(this), TQT_SLOT (slotFlip ()), ac, "image_flip"); + this, TQT_SLOT (slotFlip ()), ac, "image_flip"); m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT (slotRotate ()), ac, "image_rotate"); + this, TQT_SLOT (slotRotate ()), ac, "image_rotate"); m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K, - TQT_TQOBJECT(this), TQT_SLOT (slotSkew ()), ac, "image_skew"); + this, TQT_SLOT (slotSkew ()), ac, "image_skew"); m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); + this, TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); + this, TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I, - TQT_TQOBJECT(this), TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors"); + this, TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors"); m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N, - TQT_TQOBJECT(this), TQT_SLOT (slotClear ()), ac, "image_clear"); + this, TQT_SLOT (slotClear ()), ac, "image_clear"); m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M, - TQT_TQOBJECT(this), TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects"); + this, TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects"); enableImageMenuDocumentActions (false); } diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index b3a7448e..6dfff99b 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -57,19 +57,19 @@ void kpMainWindow::setupSettingsMenuActions () createStandardStatusBarAction (); - m_actionFullScreen = KStdAction::fullScreen (TQT_TQOBJECT(this), TQT_SLOT (slotFullScreen ()), ac, + m_actionFullScreen = KStdAction::fullScreen (this, TQT_SLOT (slotFullScreen ()), ac, this/*window*/); m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); + this, TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); m_actionShowPath->setCheckedState (i18n ("Hide &Path")); slotEnableSettingsShowPath (); - m_actionKeyBindings = KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT (slotKeyBindings ()), ac); - m_actionConfigureToolbars = KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT (slotConfigureToolBars ()), ac); - // m_actionConfigure = KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure ()), ac); + m_actionKeyBindings = KStdAction::keyBindings (this, TQT_SLOT (slotKeyBindings ()), ac); + m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolBars ()), ac); + // m_actionConfigure = KStdAction::preferences (this, TQT_SLOT (slotConfigure ()), ac); enableSettingsMenuDocumentActions (false); diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 9fd87672..11058217 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -50,22 +50,22 @@ void kpMainWindow::setupTextToolBarActions () TDEActionCollection *ac = actionCollection (); m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); + this, TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); + this, TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); m_actionTextBold = new TDEToggleAction (i18n ("Bold"), "format-text-bold"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); + this, TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); m_actionTextItalic = new TDEToggleAction (i18n ("Italic"), "format-text-italic"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); + this, TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"), "format-text-underline"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); + this, TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"), "format-text-strikethrough"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); + this, TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); readAndApplyTextSettings (); diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp index 50bd74ed..26c6bc00 100644 --- a/kolourpaint/kpmainwindow_tools.cpp +++ b/kolourpaint/kpmainwindow_tools.cpp @@ -103,23 +103,23 @@ void kpMainWindow::setupToolActions () m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_1), - TQT_TQOBJECT(this), TQT_SLOT (slotActionPrevToolOptionGroup1 ()), + this, TQT_SLOT (slotActionPrevToolOptionGroup1 ()), ac, "prev_tool_option_group_1"); m_actionNextToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_2), - TQT_TQOBJECT(this), TQT_SLOT (slotActionNextToolOptionGroup1 ()), + this, TQT_SLOT (slotActionNextToolOptionGroup1 ()), ac, "next_tool_option_group_1"); m_actionPrevToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_3), - TQT_TQOBJECT(this), TQT_SLOT (slotActionPrevToolOptionGroup2 ()), + this, TQT_SLOT (slotActionPrevToolOptionGroup2 ()), ac, "prev_tool_option_group_2"); m_actionNextToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_4), - TQT_TQOBJECT(this), TQT_SLOT (slotActionNextToolOptionGroup2 ()), + this, TQT_SLOT (slotActionNextToolOptionGroup2 ()), ac, "next_tool_option_group_2"); } diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index f76b6183..39d6cab3 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -67,18 +67,18 @@ void kpMainWindow::setupViewMenuActions () m_actionFullScreen->setEnabled (false);*/ - m_actionActualSize = KStdAction::actualSize (TQT_TQOBJECT(this), TQT_SLOT (slotActualSize ()), ac); - /*m_actionFitToPage = KStdAction::fitToPage (TQT_TQOBJECT(this), TQT_SLOT (slotFitToPage ()), ac); - m_actionFitToWidth = KStdAction::fitToWidth (TQT_TQOBJECT(this), TQT_SLOT (slotFitToWidth ()), ac); - m_actionFitToHeight = KStdAction::fitToHeight (TQT_TQOBJECT(this), TQT_SLOT (slotFitToHeight ()), ac);*/ + m_actionActualSize = KStdAction::actualSize (this, TQT_SLOT (slotActualSize ()), ac); + /*m_actionFitToPage = KStdAction::fitToPage (this, TQT_SLOT (slotFitToPage ()), ac); + m_actionFitToWidth = KStdAction::fitToWidth (this, TQT_SLOT (slotFitToWidth ()), ac); + m_actionFitToHeight = KStdAction::fitToHeight (this, TQT_SLOT (slotFitToHeight ()), ac);*/ - m_actionZoomIn = KStdAction::zoomIn (TQT_TQOBJECT(this), TQT_SLOT (slotZoomIn ()), ac); - m_actionZoomOut = KStdAction::zoomOut (TQT_TQOBJECT(this), TQT_SLOT (slotZoomOut ()), ac); + m_actionZoomIn = KStdAction::zoomIn (this, TQT_SLOT (slotZoomIn ()), ac); + m_actionZoomOut = KStdAction::zoomOut (this, TQT_SLOT (slotZoomOut ()), ac); m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); + this, TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); m_actionZoom->setEditable (true); // create the zoom list for the 1st call to zoomTo() below @@ -91,7 +91,7 @@ void kpMainWindow::setupViewMenuActions () m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G, - TQT_TQOBJECT(this), TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); + this, TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); m_actionShowGrid->setCheckedState (i18n ("Hide &Grid")); @@ -99,12 +99,12 @@ void kpMainWindow::setupViewMenuActions () // Testcase: Press CTRL+H twice on a fresh KolourPaint. // The second CTRL+H doesn't close the thumbnail. m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H, - TQT_TQOBJECT(this), TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); + this, TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail")); // Please do not use setCheckedState() here - it wouldn't make sense m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); + this, TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); // For consistency with the above action, don't use setCheckedState() // @@ -114,7 +114,7 @@ void kpMainWindow::setupViewMenuActions () d->m_actionShowThumbnailRectangle = new TDEToggleAction ( i18n ("Enable Thumbnail &Rectangle"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotThumbnailShowRectangleToggled ()), + this, TQT_SLOT (slotThumbnailShowRectangleToggled ()), actionCollection (), "view_show_thumbnail_rectangle"); @@ -511,7 +511,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor) // caused mainly by m_scrollView->center() // // TODO: remove flicker completely - //TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT (finishZoomTo ())); + //TQTimer::singleShot (0, this, TQT_SLOT (finishZoomTo ())); // Later: I don't think there is an update() that needs to be queued // - let's reduce latency instead. @@ -823,7 +823,7 @@ void kpMainWindow::notifyThumbnailGeometryChanged () { m_thumbnailSaveConfigTimer = new TQTimer (this); connect (m_thumbnailSaveConfigTimer, TQT_SIGNAL (timeout ()), - TQT_TQOBJECT(this), TQT_SLOT (slotSaveThumbnailGeometry ())); + this, TQT_SLOT (slotSaveThumbnailGeometry ())); } m_thumbnailSaveConfigTimer->start (500/*msec*/, true/*single shot*/); @@ -1122,7 +1122,7 @@ void kpMainWindow::updateThumbnail () kdDebug () << "\t\tconnecting thumbnail::visibilityChange to destroy slot" << endl; #endif connect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\t\tDONE" << endl; #endif @@ -1144,7 +1144,7 @@ void kpMainWindow::updateThumbnail () disconnect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); m_thumbnail->deleteLater (); m_thumbnail = 0; } -- cgit v1.2.1