diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-14 21:19:12 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-15 00:43:41 +0900 |
commit | 3aab8aa05b954b80e336517f93463a9b5f50f3d6 (patch) | |
tree | be6bb581b1cb695d388cb4be10282514bb067401 /kspread | |
parent | fb6b4d204d1155fa3a1bc7a128873340db1524f7 (diff) | |
download | koffice-3aab8aa05b954b80e336517f93463a9b5f50f3d6.tar.gz koffice-3aab8aa05b954b80e336517f93463a9b5f50f3d6.zip |
Remove various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kspread')
-rw-r--r-- | kspread/dialogs/kspread_dlg_formula.cpp | 2 | ||||
-rw-r--r-- | kspread/kspread_handler.cpp | 2 | ||||
-rw-r--r-- | kspread/kspread_view.cpp | 298 | ||||
-rw-r--r-- | kspread/plugins/scripting/scripting.cpp | 2 |
4 files changed, 152 insertions, 152 deletions
diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 89406321..23d9f057 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -547,7 +547,7 @@ static void showEntry( TQLineEdit* edit, TQLabel* label, edit->setText( "0" ); break; case KSpread_Int: - edit->setValidator(new TQIntValidator (TQT_TQOBJECT(edit))); + edit->setValidator(new TQIntValidator (edit)); edit->setText( "0" ); break; } diff --git a/kspread/kspread_handler.cpp b/kspread/kspread_handler.cpp index 3e9fe0e5..79d0c152 100644 --- a/kspread/kspread_handler.cpp +++ b/kspread/kspread_handler.cpp @@ -13,7 +13,7 @@ using namespace KSpread; InsertHandler::InsertHandler( View* view, TQWidget* widget ) - : KoEventHandler( TQT_TQOBJECT(widget) ) + : KoEventHandler( widget ) { m_view = view; m_started = false; diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 92d083b4..91f5edce 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -468,534 +468,534 @@ void View::Private::initActions() // -- cell formatting actions -- actions->cellLayout = new TDEAction( i18n("Cell Format..."), "cell_layout", - TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); + TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); actions->actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - TQT_TQOBJECT(view), TQT_SLOT( extraProperties() ), ac, "extra_properties" ); + view, TQT_SLOT( extraProperties() ), ac, "extra_properties" ); actions->defaultFormat = new TDEAction( i18n("Default"), - 0, TQT_TQOBJECT(view), TQT_SLOT( defaultSelection() ), ac, "default" ); + 0, view, TQT_SLOT( defaultSelection() ), ac, "default" ); actions->defaultFormat->setToolTip( i18n("Resets to the default format.") ); actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold", TQt::CTRL+TQt::Key_B, ac, "bold"); TQObject::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), - TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) ); + view, TQT_SLOT( bold( bool ) ) ); actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic", TQt::CTRL+TQt::Key_I, ac, "italic"); TQObject::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), - TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) ); + view, TQT_SLOT( italic( bool ) ) ); actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline", TQt::CTRL+TQt::Key_U, ac, "underline"); TQObject::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), - TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) ); + view, TQT_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), - TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) ); + view, TQT_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), - TQT_TQOBJECT(view), TQT_SLOT( fontSelected( const TQString& ) ) ); + view, TQT_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(view), TQT_SLOT( fontSizeSelected( int ) ) ); + view, TQT_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", - 0, TQT_TQOBJECT(view), TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); + 0, view, TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); actions->fontSizeDown = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", - 0, TQT_TQOBJECT(view), TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); + 0, view, TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); actions->textColor = new TTDESelectColorAction( i18n("Text Color"), - TTDESelectColorAction::TextColor, TQT_TQOBJECT(view), TQT_SLOT( changeTextColor() ), + TTDESelectColorAction::TextColor, view, TQT_SLOT( changeTextColor() ), ac, "textColor",true ); actions->textColor->setDefaultColor(TQColor()); actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", 0, ac, "left"); TQObject::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignLeft( bool ) ) ); + view, TQT_SLOT( alignLeft( bool ) ) ); actions->alignLeft->setExclusiveGroup( "Align" ); actions->alignLeft->setToolTip(i18n("Left justify the cell contents.")); actions->alignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", 0, ac, "center"); TQObject::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignCenter( bool ) ) ); + view, TQT_SLOT( alignCenter( bool ) ) ); actions->alignCenter->setExclusiveGroup( "Align" ); actions->alignCenter->setToolTip(i18n("Center the cell contents.")); actions->alignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", 0, ac, "right"); TQObject::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignRight( bool ) ) ); + view, TQT_SLOT( alignRight( bool ) ) ); actions->alignRight->setExclusiveGroup( "Align" ); actions->alignRight->setToolTip(i18n("Right justify the cell contents.")); actions->alignTop = new TDEToggleAction( i18n("Align Top"), "text_top", 0, ac, "top"); TQObject::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignTop( bool ) ) ); + view, TQT_SLOT( alignTop( bool ) ) ); actions->alignTop->setExclusiveGroup( "Pos" ); actions->alignTop->setToolTip(i18n("Align cell contents along the top of the cell.")); actions->alignMiddle = new TDEToggleAction( i18n("Align Middle"), "middle", 0, ac, "middle"); TQObject::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignMiddle( bool ) ) ); + view, TQT_SLOT( alignMiddle( bool ) ) ); actions->alignMiddle->setExclusiveGroup( "Pos" ); actions->alignMiddle->setToolTip(i18n("Align cell contents centered in the cell.")); actions->alignBottom = new TDEToggleAction( i18n("Align Bottom"), "text_bottom", 0, ac, "bottom"); TQObject::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( alignBottom( bool ) ) ); + view, TQT_SLOT( alignBottom( bool ) ) ); actions->alignBottom->setExclusiveGroup( "Pos" ); actions->alignBottom->setToolTip(i18n("Align cell contents along the bottom of the cell.")); actions->wrapText = new TDEToggleAction( i18n("Wrap Text"), "multirow", 0, ac, "multiRow" ); TQObject::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( wrapText( bool ) ) ); + view, TQT_SLOT( wrapText( bool ) ) ); actions->wrapText->setToolTip(i18n("Make the cell text wrap onto multiple lines.")); actions->verticalText = new TDEToggleAction( i18n("Vertical Text"),"vertical_text" , 0 ,ac, "verticaltext" ); TQObject::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( verticalText( bool ) ) ); + view, TQT_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); actions->increaseIndent = new TDEAction( i18n("Increase Indent"), TQApplication::reverseLayout() ? "format_decreaseindent":"format_increaseindent", - 0, TQT_TQOBJECT(view), TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); + 0, view, TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); actions->increaseIndent->setToolTip(i18n("Increase the indentation.")); actions->decreaseIndent = new TDEAction( i18n("Decrease Indent"), TQApplication::reverseLayout() ? "format_increaseindent" : "format_decreaseindent", - 0, TQT_TQOBJECT(view), TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); + 0, view, TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); actions->decreaseIndent->setToolTip(i18n("Decrease the indentation.")); actions->changeAngle = new TDEAction( i18n("Change Angle..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( changeAngle() ), ac, "changeangle" ); + 0, view, TQT_SLOT( changeAngle() ), ac, "changeangle" ); actions->changeAngle->setToolTip(i18n("Change the angle that cell contents are printed.")); actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); TQObject::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( percent( bool ) ) ); + view, TQT_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); actions->precplus = new TDEAction( i18n("Increase Precision"), "prec_plus", - 0, TQT_TQOBJECT(view), TQT_SLOT( precisionPlus() ), ac, "precplus"); + 0, view, TQT_SLOT( precisionPlus() ), ac, "precplus"); actions->precplus->setToolTip(i18n("Increase the decimal precision shown onscreen.")); actions->precminus = new TDEAction( i18n("Decrease Precision"), "prec_minus", - 0, TQT_TQOBJECT(view), TQT_SLOT( precisionMinus() ), ac, "precminus"); + 0, view, TQT_SLOT( precisionMinus() ), ac, "precminus"); actions->precminus->setToolTip(i18n("Decrease the decimal precision shown onscreen.")); actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); TQObject::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( moneyFormat( bool ) ) ); + view, TQT_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); actions->upper = new TDEAction( i18n("Upper Case"), "fontsizeup", - 0, TQT_TQOBJECT(view), TQT_SLOT( upper() ), ac, "upper" ); + 0, view, TQT_SLOT( upper() ), ac, "upper" ); actions->upper->setToolTip(i18n("Convert all letters to upper case.")); actions->lower = new TDEAction( i18n("Lower Case"), "fontsizedown", - 0, TQT_TQOBJECT(view), TQT_SLOT( lower() ), ac, "lower" ); + 0, view, TQT_SLOT( lower() ), ac, "lower" ); actions->lower->setToolTip(i18n("Convert all letters to lower case.")); actions->firstLetterUpper = new TDEAction( i18n("Convert First Letter to Upper Case"), "first_letter_upper", - 0, TQT_TQOBJECT(view), TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); + 0, view, TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); actions->firstLetterUpper->setToolTip(i18n("Capitalize the first letter.")); actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); TQObject::connect(actions->bgColor, TQT_SIGNAL( activated() ), - TQT_TQOBJECT(view), TQT_SLOT( changeBackgroundColor() ) ); + view, TQT_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); actions->borderLeft = new TDEAction( i18n("Border Left"), "border_left", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderLeft() ), ac, "borderLeft" ); + 0, view, TQT_SLOT( borderLeft() ), ac, "borderLeft" ); actions->borderLeft->setToolTip(i18n("Set a left border to the selected area.")); actions->borderRight = new TDEAction( i18n("Border Right"), "border_right", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderRight() ), ac, "borderRight" ); + 0, view, TQT_SLOT( borderRight() ), ac, "borderRight" ); actions->borderRight->setToolTip(i18n("Set a right border to the selected area.")); actions->borderTop = new TDEAction( i18n("Border Top"), "border_top", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderTop() ), ac, "borderTop" ); + 0, view, TQT_SLOT( borderTop() ), ac, "borderTop" ); actions->borderTop->setToolTip(i18n("Set a top border to the selected area.")); actions->borderBottom = new TDEAction( i18n("Border Bottom"), "border_bottom", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderBottom() ), ac, "borderBottom" ); + 0, view, TQT_SLOT( borderBottom() ), ac, "borderBottom" ); actions->borderBottom->setToolTip(i18n("Set a bottom border to the selected area.")); actions->borderAll = new TDEAction( i18n("All Borders"), "border_all", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderAll() ), ac, "borderAll" ); + 0, view, TQT_SLOT( borderAll() ), ac, "borderAll" ); actions->borderAll->setToolTip(i18n("Set a border around all cells in the selected area.")); actions->borderRemove = new TDEAction( i18n("Remove Borders"), "border_remove", - 0, TQT_TQOBJECT(view), TQT_SLOT( borderRemove() ), ac, "borderRemove" ); + 0, view, TQT_SLOT( borderRemove() ), ac, "borderRemove" ); actions->borderRemove->setToolTip(i18n("Remove all borders in the selected area.")); actions->borderOutline = new TDEAction( i18n("Border Outline"), ("border_outline"), - 0, TQT_TQOBJECT(view), TQT_SLOT( borderOutline() ), ac, "borderOutline" ); + 0, view, TQT_SLOT( borderOutline() ), ac, "borderOutline" ); actions->borderOutline->setToolTip(i18n("Set a border to the outline of the selected area.")); actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, ac, "borderColor" ); TQObject::connect( actions->borderColor, TQT_SIGNAL( activated() ), - TQT_TQOBJECT(view), TQT_SLOT( changeBorderColor() ) ); + view, TQT_SLOT( changeBorderColor() ) ); actions->borderColor->setToolTip( i18n( "Select a new border color." ) ); actions->selectStyle = new TDESelectAction( i18n( "St&yle" ), 0, ac, "stylemenu" ); actions->selectStyle->setToolTip( i18n( "Apply a predefined style to the selected cells." ) ); TQObject::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(view), TQT_SLOT( styleSelected( const TQString & ) ) ); + view, TQT_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), - 0, TQT_TQOBJECT(view), TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); + 0, view, TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); actions->createStyle->setToolTip( i18n( "Create a new style based on the currently selected cell." ) ); // -- cell operation actions -- actions->editCell = new TDEAction( i18n("Modify Cell"),"cell_edit", - TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(view), TQT_SLOT( editCell() ), ac, "editCell" ); + TQt::CTRL+TQt::Key_M, view, TQT_SLOT( editCell() ), ac, "editCell" ); actions->editCell->setToolTip(i18n("Edit the highlighted cell.")); actions->insertCell = new TDEAction( i18n("Insert Cells..."), "insertcell", - 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsert() ), ac, "insertCell" ); + 0, view, TQT_SLOT( slotInsert() ), ac, "insertCell" ); actions->insertCell->setToolTip(i18n("Insert a blank cell into the spreadsheet.")); actions->removeCell = new TDEAction( i18n("Remove Cells..."), "removecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( slotRemove() ), ac, "removeCell" ); + 0, view, TQT_SLOT( slotRemove() ), ac, "removeCell" ); actions->removeCell->setToolTip(i18n("Removes the current cell from the spreadsheet.")); actions->deleteCell = new TDEAction( i18n("Delete"), "deletecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( deleteSelection() ), ac, "delete" ); + 0, view, TQT_SLOT( deleteSelection() ), ac, "delete" ); actions->deleteCell->setToolTip(i18n("Delete all contents and formatting of the current cell.")); actions->mergeCell = new TDEToolBarPopupAction( i18n("Merge Cells"),"mergecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCell() ), ac, "mergecell" ); + 0, view, TQT_SLOT( mergeCell() ), ac, "mergecell" ); actions->mergeCell->setToolTip(i18n("Merge the selected region.")); actions->mergeCell->plug( actions->mergeCell->popupMenu() ); actions->mergeCellHorizontal = new TDEAction( i18n("Merge Cells Horizontally"),"mergecell-horizontal", - 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); + 0, view, TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally.")); actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() ); actions->mergeCellVertical = new TDEAction( i18n("Merge Cells Vertically"),"mergecell-vertical", - 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); + 0, view, TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically.")); actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() ); actions->dissociateCell = new TDEAction( i18n("Dissociate Cells"),"dissociatecell", - 0, TQT_TQOBJECT(view), TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); + 0, view, TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); actions->dissociateCell->setToolTip(i18n("Unmerge the selected region.")); actions->clearText = new TDEAction( i18n("Text"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); + 0, view, TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); actions->clearText->setToolTip(i18n("Remove the contents of the current cell.")); actions->conditional = new TDEAction( i18n("Conditional Cell Attributes..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( conditional() ), ac, "conditional" ); + 0, view, TQT_SLOT( conditional() ), ac, "conditional" ); actions->conditional->setToolTip(i18n("Set cell format based on certain conditions.")); actions->clearConditional = new TDEAction( i18n("Conditional Cell Attributes"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); + 0, view, TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); actions->clearConditional->setToolTip(i18n("Remove the conditional cell formatting.")); actions->validity = new TDEAction( i18n("Validity..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( validity() ), ac, "validity" ); + 0, view, TQT_SLOT( validity() ), ac, "validity" ); actions->validity->setToolTip(i18n("Set tests to confirm cell data is valid.")); actions->clearValidity = new TDEAction( i18n("Validity"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); + 0, view, TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); actions->clearValidity->setToolTip(i18n("Remove the validity tests on this cell.")); actions->addModifyComment = new TDEAction( i18n("&Add/Modify Comment..."),"comment", - 0, TQT_TQOBJECT(view), TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); + 0, view, TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); actions->addModifyComment->setToolTip(i18n("Edit a comment for this cell.")); actions->removeComment = new TDEAction( i18n("&Remove Comment"),"removecomment", - 0, TQT_TQOBJECT(view), TQT_SLOT( removeComment() ), ac, "removecomment" ); + 0, view, TQT_SLOT( removeComment() ), ac, "removecomment" ); actions->removeComment->setToolTip(i18n("Remove this cell's comment.")); actions->clearComment = new TDEAction( i18n("Comment"), - 0, TQT_TQOBJECT(view), TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); + 0, view, TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); actions->clearComment->setToolTip(i18n("Remove this cell's comment.")); // -- column & row actions -- actions->resizeColumn = new TDEAction( i18n("Resize Column..."), "resizecol", - 0, TQT_TQOBJECT(view), TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); + 0, view, TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); actions->resizeColumn->setToolTip(i18n("Change the width of a column.")); actions->insertColumn = new TDEAction( i18n("Insert Columns"), "insert_table_col", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertColumn() ), ac, "insertColumn" ); + 0, view, TQT_SLOT( insertColumn() ), ac, "insertColumn" ); actions->insertColumn->setToolTip(i18n("Inserts a new column into the spreadsheet.")); actions->deleteColumn = new TDEAction( i18n("Delete Columns"), "delete_table_col", - 0, TQT_TQOBJECT(view), TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); + 0, view, TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); actions->deleteColumn->setToolTip(i18n("Removes a column from the spreadsheet.")); actions->hideColumn = new TDEAction( i18n("Hide Columns"), "hide_table_column", - 0, TQT_TQOBJECT(view), TQT_SLOT( hideColumn() ), ac, "hideColumn" ); + 0, view, TQT_SLOT( hideColumn() ), ac, "hideColumn" ); actions->hideColumn->setToolTip(i18n("Hide the column from view.")); actions->showColumn = new TDEAction( i18n("Show Columns..."), "show_table_column", - 0, TQT_TQOBJECT(view), TQT_SLOT( showColumn() ), ac, "showColumn" ); + 0, view, TQT_SLOT( showColumn() ), ac, "showColumn" ); actions->showColumn->setToolTip(i18n("Show hidden columns.")); actions->equalizeColumn = new TDEAction( i18n("Equalize Column"), "adjustcol", - 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); + 0, view, TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); actions->equalizeColumn->setToolTip(i18n("Resizes selected columns to be the same size.")); actions->showSelColumns = new TDEAction( i18n("Show Columns"), "show_sheet_column", - 0, TQT_TQOBJECT(view), TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); + 0, view, TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); actions->showSelColumns->setToolTip(i18n("Show hidden columns in the selection.")); actions->showSelColumns->setEnabled(false); actions->resizeRow = new TDEAction( i18n("Resize Row..."), "resizerow", - 0, TQT_TQOBJECT(view), TQT_SLOT( resizeRow() ), ac, "resizeRow" ); + 0, view, TQT_SLOT( resizeRow() ), ac, "resizeRow" ); actions->resizeRow->setToolTip(i18n("Change the height of a row.")); actions->insertRow = new TDEAction( i18n("Insert Rows"), "insert_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertRow() ), ac, "insertRow" ); + 0, view, TQT_SLOT( insertRow() ), ac, "insertRow" ); actions->insertRow->setToolTip(i18n("Inserts a new row into the spreadsheet.")); actions->deleteRow = new TDEAction( i18n("Delete Rows"), "delete_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( deleteRow() ), ac, "deleteRow" ); + 0, view, TQT_SLOT( deleteRow() ), ac, "deleteRow" ); actions->deleteRow->setToolTip(i18n("Removes a row from the spreadsheet.")); actions->hideRow = new TDEAction( i18n("Hide Rows"), "hide_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( hideRow() ), ac, "hideRow" ); + 0, view, TQT_SLOT( hideRow() ), ac, "hideRow" ); actions->hideRow->setToolTip(i18n("Hide a row from view.")); actions->showRow = new TDEAction( i18n("Show Rows..."), "show_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( showRow() ), ac, "showRow" ); + 0, view, TQT_SLOT( showRow() ), ac, "showRow" ); actions->showRow->setToolTip(i18n("Show hidden rows.")); actions->equalizeRow = new TDEAction( i18n("Equalize Row"), "adjustrow", - 0, TQT_TQOBJECT(view), TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); + 0, view, TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); actions->equalizeRow->setToolTip(i18n("Resizes selected rows to be the same size.")); actions->showSelRows = new TDEAction( i18n("Show Rows"), "show_table_row", - 0, TQT_TQOBJECT(view), TQT_SLOT( showSelRows() ), ac, "showSelRows" ); + 0, view, TQT_SLOT( showSelRows() ), ac, "showSelRows" ); actions->showSelRows->setEnabled(false); actions->showSelRows->setToolTip(i18n("Show hidden rows in the selection.")); actions->adjust = new TDEAction( i18n("Adjust Row && Column"), - 0, TQT_TQOBJECT(view), TQT_SLOT( adjust() ), ac, "adjust" ); + 0, view, TQT_SLOT( adjust() ), ac, "adjust" ); actions->adjust->setToolTip(i18n("Adjusts row/column size so that the contents will fit.")); // -- sheet/workbook actions -- actions->sheetProperties = new TDEAction( i18n("Sheet Properties"), - 0, TQT_TQOBJECT(view), TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); + 0, view, TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); actions->sheetProperties->setToolTip(i18n("Modify current sheet's properties.")); actions->insertSheet = new TDEAction( i18n("Insert Sheet"),"inserttable", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "insertSheet" ); + 0, view, TQT_SLOT( insertSheet() ), ac, "insertSheet" ); actions->insertSheet->setToolTip(i18n("Insert a new sheet.")); // same action as insertSheet, but without 'insert' in the caption actions->menuInsertSheet = new TDEAction( i18n("&Sheet"),"inserttable", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); + 0, view, TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); actions->menuInsertSheet->setToolTip(i18n("Insert a new sheet.")); actions->removeSheet = new TDEAction( i18n("Remove Sheet"), "delete_table", - 0, TQT_TQOBJECT(view), TQT_SLOT( removeSheet() ), ac, "removeSheet" ); + 0, view, TQT_SLOT( removeSheet() ), ac, "removeSheet" ); actions->removeSheet->setToolTip(i18n("Remove the active sheet.")); actions->renameSheet=new TDEAction( i18n("Rename Sheet..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( slotRename() ), ac, "renameSheet" ); + 0, view, TQT_SLOT( slotRename() ), ac, "renameSheet" ); actions->renameSheet->setToolTip(i18n("Rename the active sheet.")); actions->showSheet = new TDEAction(i18n("Show Sheet..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( showSheet()), ac, "showSheet" ); + 0, view, TQT_SLOT( showSheet()), ac, "showSheet" ); actions->showSheet->setToolTip(i18n("Show a hidden sheet.")); actions->hideSheet = new TDEAction(i18n("Hide Sheet"), - 0, TQT_TQOBJECT(view), TQT_SLOT( hideSheet() ), ac, "hideSheet" ); + 0, view, TQT_SLOT( hideSheet() ), ac, "hideSheet" ); actions->hideSheet->setToolTip(i18n("Hide the active sheet.")); actions->autoFormat = new TDEAction( i18n("AutoFormat..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); + 0, view, TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); actions->autoFormat->setToolTip(i18n("Set the worksheet formatting.")); actions->areaName = new TDEAction( i18n("Area Name..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( setAreaName() ), ac, "areaname" ); + 0, view, TQT_SLOT( setAreaName() ), ac, "areaname" ); actions->areaName->setToolTip(i18n("Set a name for a region of the spreadsheet.")); actions->showArea = new TDEAction( i18n("Show Area..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( showAreaName() ), ac, "showArea" ); + 0, view, TQT_SLOT( showAreaName() ), ac, "showArea" ); actions->showArea->setToolTip(i18n("Display a named area.")); actions->insertFunction = new TDEAction( i18n("&Function..."), "funct", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); + 0, view, TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); actions->insertFunction->setToolTip(i18n("Insert math expression.")); actions->insertSeries = new TDEAction( i18n("&Series..."),"series", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertSeries() ), ac, "series"); + 0, view, TQT_SLOT( insertSeries() ), ac, "series"); actions->insertSeries ->setToolTip(i18n("Insert a series.")); actions->insertLink = new TDEAction( i18n("&Link..."), "insert_link", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); + 0, view, TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink.")); actions->removeLink = new TDEAction( i18n("&Remove Link"), - 0, TQT_TQOBJECT(view), TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); + 0, view, TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); actions->removeLink->setToolTip(i18n("Remove a link.")); actions->insertSpecialChar = new TDEAction( i18n( "S&pecial Character..." ), "char", - TQT_TQOBJECT(view), TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); + view, TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); actions->insertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); actions->insertPart = new KoPartSelectAction( i18n("&Object"), "frame_query", - TQT_TQOBJECT(view), TQT_SLOT( insertObject() ), ac, "insertPart"); + view, TQT_SLOT( insertObject() ), ac, "insertPart"); actions->insertPart->setToolTip(i18n("Insert an object from another program.")); actions->insertChartFrame = new TDEToggleAction( i18n("&Chart"), "insert_chart", - 0, TQT_TQOBJECT(view), TQT_SLOT( insertChart() ), ac, "insertChart" ); + 0, view, TQT_SLOT( insertChart() ), ac, "insertChart" ); actions->insertChartFrame->setToolTip(i18n("Insert a chart.")); actions->insertPicture = new TDEAction( i18n("&Picture"), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertPicture() ), ac, "insertPicture" ); + 0, view, TQT_SLOT( insertPicture() ), ac, "insertPicture" ); actions->insertPicture->setToolTip(i18n("Insert a picture.")); #ifndef TQT_NO_SQL actions->insertFromDatabase = new TDEAction( i18n("From &Database..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); + 0, view, TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); actions->insertFromDatabase->setToolTip(i18n("Insert data from a SQL database.")); #endif actions->insertFromTextfile = new TDEAction( i18n("From &Text File..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); + 0, view, TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); actions->insertFromTextfile->setToolTip(i18n("Insert data from a text file to the current cursor position/selection.")); actions->insertFromClipboard = new TDEAction( i18n("From &Clipboard..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); + 0, view, TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); actions->insertFromClipboard->setToolTip(i18n("Insert CSV data from the clipboard to the current cursor position/selection.")); // actions->transform = new TDEAction( i18n("Transform Object..."), "rotate", -// 0, TQT_TQOBJECT(view), TQT_SLOT( transformPart() ), ac, "transform" ); +// 0, view, TQT_SLOT( transformPart() ), ac, "transform" ); // actions->transform->setToolTip(i18n("Rotate the contents of the cell.")); // actions->transform->setEnabled( false ); actions->sort = new TDEAction( i18n("&Sort..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( sort() ), ac, "sort" ); + 0, view, TQT_SLOT( sort() ), ac, "sort" ); actions->sort->setToolTip(i18n("Sort a group of cells.")); actions->sortDec = new TDEAction( i18n("Sort &Decreasing"), "sort_decrease", - 0, TQT_TQOBJECT(view), TQT_SLOT( sortDec() ), ac, "sortDec" ); + 0, view, TQT_SLOT( sortDec() ), ac, "sortDec" ); actions->sortDec->setToolTip(i18n("Sort a group of cells in decreasing (last to first) order.")); actions->sortInc = new TDEAction( i18n("Sort &Increasing"), "sort_incr", - 0, TQT_TQOBJECT(view), TQT_SLOT( sortInc() ), ac, "sortInc" ); + 0, view, TQT_SLOT( sortInc() ), ac, "sortInc" ); actions->sortInc->setToolTip(i18n("Sort a group of cells in ascending (first to last) order.")); actions->paperLayout = new TDEAction( i18n("Page Layout..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); + 0, view, TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); actions->definePrintRange = new TDEAction( i18n("Define Print Range"), - 0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); + 0, view, TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->resetPrintRange = new TDEAction( i18n("Reset Print Range"), - 0, TQT_TQOBJECT(view), TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); + 0, view, TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); TQObject::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( togglePageBorders( bool ) ) ); + view, TQT_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); actions->recalcWorksheet = new TDEAction( i18n("Recalculate Sheet"), - TQt::SHIFT + TQt::Key_F9, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); + TQt::SHIFT + TQt::Key_F9, view, TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); actions->recalcWorksheet->setToolTip(i18n("Recalculate the value of every cell in the current worksheet.")); actions->recalcWorkbook = new TDEAction( i18n("Recalculate Document"), - TQt::Key_F9, TQT_TQOBJECT(view), TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); + TQt::Key_F9, view, TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); actions->recalcWorkbook->setToolTip(i18n("Recalculate the value of every cell in all worksheets.")); actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); TQObject::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( toggleProtectSheet( bool ) ) ); + view, TQT_SLOT( toggleProtectSheet( bool ) ) ); actions->protectDoc = new TDEToggleAction( i18n( "Protect &Document..." ), 0, ac, "protectDoc" ); actions->protectDoc->setToolTip( i18n( "Protect the document from being modified." ) ); TQObject::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( toggleProtectDoc( bool ) ) ); + view, TQT_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- - actions->copy = KStdAction::copy( TQT_TQOBJECT(view), TQT_SLOT( copySelection() ), ac, "copy" ); + actions->copy = KStdAction::copy( view, TQT_SLOT( copySelection() ), ac, "copy" ); actions->copy->setToolTip(i18n("Copy the cell object to the clipboard.")); - actions->paste = KStdAction::paste( TQT_TQOBJECT(view), TQT_SLOT( paste() ), ac, "paste" ); + actions->paste = KStdAction::paste( view, TQT_SLOT( paste() ), ac, "paste" ); actions->paste->setToolTip(i18n("Paste the contents of the clipboard at the cursor.")); - actions->cut = KStdAction::cut( TQT_TQOBJECT(view), TQT_SLOT( cutSelection() ), ac, "cut" ); + actions->cut = KStdAction::cut( view, TQT_SLOT( cutSelection() ), ac, "cut" ); actions->cut->setToolTip(i18n("Move the cell object to the clipboard.")); actions->specialPaste = new TDEAction( i18n("Special Paste..."), "special_paste", - 0, TQT_TQOBJECT(view), TQT_SLOT( specialPaste() ), ac, "specialPaste" ); + 0, view, TQT_SLOT( specialPaste() ), ac, "specialPaste" ); actions->specialPaste->setToolTip(i18n("Paste the contents of the clipboard with special options.")); actions->insertCellCopy = new TDEAction( i18n("Paste with Insertion"), "insertcellcopy", - 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); + 0, view, TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); - actions->find = KStdAction::find( TQT_TQOBJECT(view), TQT_SLOT(find()), ac ); - /*actions->findNext =*/ KStdAction::findNext( TQT_TQOBJECT(view), TQT_SLOT( findNext() ), ac ); - /*actions->findPrevious =*/ KStdAction::findPrev( TQT_TQOBJECT(view), TQT_SLOT( findPrevious() ), ac ); + actions->find = KStdAction::find( view, TQT_SLOT(find()), ac ); + /*actions->findNext =*/ KStdAction::findNext( view, TQT_SLOT( findNext() ), ac ); + /*actions->findPrevious =*/ KStdAction::findPrev( view, TQT_SLOT( findPrevious() ), ac ); - actions->replace = KStdAction::replace( TQT_TQOBJECT(view), TQT_SLOT(replace()), ac ); + actions->replace = KStdAction::replace( view, TQT_SLOT(replace()), ac ); actions->fillRight = new TDEAction( i18n( "&Right" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillRight() ), ac, "fillRight" ); + 0, view, TQT_SLOT( fillRight() ), ac, "fillRight" ); actions->fillLeft = new TDEAction( i18n( "&Left" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillLeft() ), ac, "fillLeft" ); + 0, view, TQT_SLOT( fillLeft() ), ac, "fillLeft" ); actions->fillDown = new TDEAction( i18n( "&Down" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillDown() ), ac, "fillDown" ); + 0, view, TQT_SLOT( fillDown() ), ac, "fillDown" ); actions->fillUp = new TDEAction( i18n( "&Up" ), 0, - 0, TQT_TQOBJECT(view), TQT_SLOT( fillUp() ), ac, "fillUp" ); + 0, view, TQT_SLOT( fillUp() ), ac, "fillUp" ); // -- misc actions -- actions->styleDialog = new TDEAction( i18n( "Style Manager" ), - 0, TQT_TQOBJECT(view), TQT_SLOT( styleDialog() ), ac, "styles" ); + 0, view, TQT_SLOT( styleDialog() ), ac, "styles" ); actions->styleDialog->setToolTip( i18n( "Edit and organize cell styles." ) ); actions->autoSum = new TDEAction( i18n("Autosum"), "black_sum", - 0, TQT_TQOBJECT(view), TQT_SLOT( autoSum() ), ac, "autoSum" ); + 0, view, TQT_SLOT( autoSum() ), ac, "autoSum" ); actions->autoSum->setToolTip(i18n("Insert the 'sum' function")); - actions->spellChecking = KStdAction::spelling( TQT_TQOBJECT(view), TQT_SLOT( extraSpelling() ), + actions->spellChecking = KStdAction::spelling( view, TQT_SLOT( extraSpelling() ), ac, "spelling" ); actions->spellChecking->setToolTip(i18n("Check the spelling.")); @@ -1014,59 +1014,59 @@ void View::Private::initActions() actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), - TQT_TQOBJECT(view), TQT_SLOT( formulaSelection( const TQString& ) ) ); + view, TQT_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), - TQT_TQOBJECT(view), TQT_SLOT( viewZoom( const TQString & ) ) ); + view, TQT_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( consolidate() ), ac, "consolidate" ); + 0, view, TQT_SLOT( consolidate() ), ac, "consolidate" ); actions->consolidate->setToolTip(i18n("Create a region of summary data from a group of similar regions.")); actions->goalSeek = new TDEAction( i18n("&Goal Seek..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( goalSeek() ), ac, "goalSeek" ); + 0, view, TQT_SLOT( goalSeek() ), ac, "goalSeek" ); actions->goalSeek->setToolTip( i18n("Repeating calculation to find a specific value.") ); actions->subTotals = new TDEAction( i18n("&Subtotals..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( subtotals() ), ac, "subtotals" ); + 0, view, TQT_SLOT( subtotals() ), ac, "subtotals" ); actions->subTotals->setToolTip( i18n("Create different kind of subtotals to a list or database.") ); actions->textToColumns = new TDEAction( i18n("&Text to Columns..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( textToColumns() ), ac, "textToColumns" ); + 0, view, TQT_SLOT( textToColumns() ), ac, "textToColumns" ); actions->textToColumns->setToolTip( i18n("Expand the content of cells to multiple columns.") ); actions->multipleOperations = new TDEAction( i18n("&Multiple Operations..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); + 0, view, TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); actions->multipleOperations->setToolTip( i18n("Apply the same formula to various cells using different values for the parameter.") ); actions->createTemplate = new TDEAction( i18n( "&Create Template From Document..." ), - 0, TQT_TQOBJECT(view), TQT_SLOT( createTemplate() ), ac, "createTemplate" ); + 0, view, TQT_SLOT( createTemplate() ), ac, "createTemplate" ); actions->customList = new TDEAction( i18n("Custom Lists..."), - 0, TQT_TQOBJECT(view), TQT_SLOT( sortList() ), ac, "sortlist" ); + 0, view, TQT_SLOT( sortList() ), ac, "sortlist" ); actions->customList->setToolTip(i18n("Create custom lists for sorting or autofill.")); // -- navigation actions -- actions->gotoCell = new TDEAction( i18n("Goto Cell..."),"goto", - 0, TQT_TQOBJECT(view), TQT_SLOT( gotoCell() ), ac, "gotoCell" ); + 0, view, TQT_SLOT( gotoCell() ), ac, "gotoCell" ); actions->gotoCell->setToolTip(i18n("Move to a particular cell.")); actions->nextSheet = new TDEAction( i18n("Next Sheet"), "forward", - TQt::CTRL+TQt::Key_PageDown, TQT_TQOBJECT(view), TQT_SLOT( nextSheet() ), ac, "nextSheet"); + TQt::CTRL+TQt::Key_PageDown, view, TQT_SLOT( nextSheet() ), ac, "nextSheet"); actions->nextSheet->setToolTip(i18n("Move to the next sheet.")); actions->prevSheet = new TDEAction( i18n("Previous Sheet"), "back", - TQt::CTRL+TQt::Key_PageUp, TQT_TQOBJECT(view), TQT_SLOT( previousSheet() ), ac, "previousSheet"); + TQt::CTRL+TQt::Key_PageUp, view, TQT_SLOT( previousSheet() ), ac, "previousSheet"); actions->prevSheet->setToolTip(i18n("Move to the previous sheet.")); actions->firstSheet = new TDEAction( i18n("First Sheet"), "go-first", - 0, TQT_TQOBJECT(view), TQT_SLOT( firstSheet() ), ac, "firstSheet"); + 0, view, TQT_SLOT( firstSheet() ), ac, "firstSheet"); actions->firstSheet->setToolTip(i18n("Move to the first sheet.")); actions->lastSheet = new TDEAction( i18n("Last Sheet"), "go-last", - 0, TQT_TQOBJECT(view), TQT_SLOT( lastSheet() ), ac, "lastSheet"); + 0, view, TQT_SLOT( lastSheet() ), ac, "lastSheet"); actions->lastSheet->setToolTip(i18n("Move to the last sheet.")); // -- settings actions -- @@ -1075,77 +1075,77 @@ void View::Private::initActions() 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( showStatusBar( bool ) ) ); + view, TQT_SLOT( showStatusBar( bool ) ) ); actions->showStatusBar->setToolTip(i18n("Show the status bar.")); actions->showTabBar = new TDEToggleAction( i18n("Show Tab Bar"), 0, ac, "showTabBar" ); actions->showTabBar->setCheckedState(i18n("Hide Tab Bar")); TQObject::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( showTabBar( bool ) ) ); + view, TQT_SLOT( showTabBar( bool ) ) ); actions->showTabBar->setToolTip(i18n("Show the tab bar.")); actions->showFormulaBar = new TDEToggleAction( i18n("Show Formula Bar"), 0, ac, "showFormulaBar" ); actions->showFormulaBar->setCheckedState(i18n("Hide Formula Bar")); TQObject::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( showFormulaBar( bool ) ) ); + view, TQT_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); actions->preference = new TDEAction( i18n("Configure KSpread..."),"configure", - 0, TQT_TQOBJECT(view), TQT_SLOT( preference() ), ac, "preference" ); + 0, view, TQT_SLOT( preference() ), ac, "preference" ); actions->preference->setToolTip(i18n("Set various KSpread options.")); // -- running calculation actions -- actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); TQObject::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcNone->setExclusiveGroup( "Calc" ); actions->calcNone->setToolTip(i18n("No calculation")); actions->calcSum = new TDEToggleAction( i18n("Sum"), 0, ac, "menu_sum"); TQObject::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcSum->setExclusiveGroup( "Calc" ); actions->calcSum->setToolTip(i18n("Calculate using sum.")); actions->calcMin = new TDEToggleAction( i18n("Min"), 0, ac, "menu_min"); TQObject::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcMin->setExclusiveGroup( "Calc" ); actions->calcMin->setToolTip(i18n("Calculate using minimum.")); actions->calcMax = new TDEToggleAction( i18n("Max"), 0, ac, "menu_max"); TQObject::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcMax->setExclusiveGroup( "Calc" ); actions->calcMax->setToolTip(i18n("Calculate using maximum.")); actions->calcAverage = new TDEToggleAction( i18n("Average"), 0, ac, "menu_average"); TQObject::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcAverage->setExclusiveGroup( "Calc" ); actions->calcAverage->setToolTip(i18n("Calculate using average.")); actions->calcCount = new TDEToggleAction( i18n("Count"), 0, ac, "menu_count"); TQObject::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcCount->setExclusiveGroup( "Calc" ); actions->calcCount->setToolTip(i18n("Calculate using the count.")); actions->calcCountA = new TDEToggleAction( i18n("CountA"), 0, ac, "menu_counta"); TQObject::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); + view, TQT_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); actions->calcCountA->setToolTip(i18n("Calculate using the countA.")); // -- special action, only for developers -- actions->internalTests = new TDEAction( i18n("Run Internal Tests..."), "internalTests", - TQt::CTRL+ TQt::SHIFT + TQt::Key_T, TQT_TQOBJECT(view), TQT_SLOT( runInternalTests() ), ac, "internalTests" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQT_SLOT( runInternalTests() ), ac, "internalTests" ); actions->inspector = new TDEAction( i18n("Run Inspector..."), "inspector", - TQt::CTRL+ TQt::SHIFT + TQt::Key_I, TQT_TQOBJECT(view), TQT_SLOT( runInspector() ), ac, "inspector" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQT_SLOT( runInspector() ), ac, "inspector" ); m_propertyEditor = 0; } @@ -2296,7 +2296,7 @@ void View::startKSpell() doc()->getKSpellConfig()->setReplaceAllList( d->spell.replaceAll ); } - d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), + d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( spellCheckerReady() ), doc()->getKSpellConfig() ); diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp index 040bd98d..4bc3f1a6 100644 --- a/kspread/plugins/scripting/scripting.cpp +++ b/kspread/plugins/scripting/scripting.cpp @@ -67,7 +67,7 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); Kross::Api::Manager::scriptManager()->addTQObject(m_view->doc(), "KSpreadDocument"); - Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_view), "KSpreadView"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KSpreadView"); } } |