diff options
Diffstat (limited to 'kspread')
| -rw-r--r-- | kspread/dialogs/kspread_dlg_formula.cpp | 10 | ||||
| -rw-r--r-- | kspread/dialogs/kspread_dlg_goalseek.cpp | 6 | ||||
| -rw-r--r-- | kspread/dialogs/kspread_dlg_paperlayout.cpp | 6 | ||||
| -rw-r--r-- | kspread/kspread_editors.cpp | 4 | ||||
| -rw-r--r-- | kspread/kspread_view.cpp | 140 |
5 files changed, 83 insertions, 83 deletions
diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 8e53c525..89406321 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -271,15 +271,15 @@ void FormulaDialog::slotSearchText(const TQString &_text) bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(firstElement) && ev->type() == TQEvent::FocusIn ) + if ( obj == firstElement && ev->type() == TQEvent::FocusIn ) m_focus = firstElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(secondElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == secondElement && ev->type() == TQEvent::FocusIn ) m_focus = secondElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(thirdElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == thirdElement && ev->type() == TQEvent::FocusIn ) m_focus = thirdElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fourElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == fourElement && ev->type() == TQEvent::FocusIn ) m_focus = fourElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fiveElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == fiveElement && ev->type() == TQEvent::FocusIn ) m_focus = fiveElement; else return FALSE; diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index b45525ad..1a2e5d59 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -197,11 +197,11 @@ GoalSeekDialog::~GoalSeekDialog() bool GoalSeekDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetValueEdit) && ev->type() == TQEvent::FocusIn ) + if ( obj == m_targetValueEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_targetValueEdit; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetEdit) && ev->type() == TQEvent::FocusIn ) + else if ( obj == m_targetEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_targetEdit; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_sourceEdit) && ev->type() == TQEvent::FocusIn ) + else if ( obj == m_sourceEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_sourceEdit; else return FALSE; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index 3305963e..bdd65a26 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -538,11 +538,11 @@ void PaperLayout::slotCancel() bool PaperLayout::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(ePrintRange) && ev->type() == TQEvent::FocusIn ) + if ( obj == ePrintRange && ev->type() == TQEvent::FocusIn ) m_focus = ePrintRange; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatCols) && ev->type() == TQEvent::FocusIn ) + else if ( obj == eRepeatCols && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatCols; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatRows) && ev->type() == TQEvent::FocusIn ) + else if ( obj == eRepeatRows && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatRows; else return false; diff --git a/kspread/kspread_editors.cpp b/kspread/kspread_editors.cpp index 4af76159..add8d217 100644 --- a/kspread/kspread_editors.cpp +++ b/kspread/kspread_editors.cpp @@ -378,7 +378,7 @@ void FunctionCompletion::itemSelected( const TQString& item ) bool FunctionCompletion::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionPopup) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionListBox) ) + if ( obj == d->completionPopup || obj == d->completionListBox ) { if ( ev->type() == TQEvent::KeyPress ) { @@ -1166,7 +1166,7 @@ void CellEditor::setCursorPosition( int pos ) bool CellEditor::eventFilter( TQObject* o, TQEvent* e ) { // Only interested in KTextEdit - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(d->textEdit) ) + if ( o != d->textEdit ) return false; if ( e->type() == TQEvent::FocusOut ) { diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index f054cbba..5561bb73 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -480,32 +480,32 @@ void View::Private::initActions() actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold", TQt::CTRL+TQt::Key_B, ac, "bold"); - TQT_BASE_OBJECT_NAME::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) ); actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic", TQt::CTRL+TQt::Key_I, ac, "italic"); - TQT_BASE_OBJECT_NAME::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) ); actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline", TQt::CTRL+TQt::Key_U, ac, "underline"); - TQT_BASE_OBJECT_NAME::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); - TQT_BASE_OBJECT_NAME::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); - TQT_BASE_OBJECT_NAME::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), + TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); - TQT_BASE_OBJECT_NAME::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), + TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", @@ -521,55 +521,55 @@ void View::Private::initActions() actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", 0, ac, "left"); - TQT_BASE_OBJECT_NAME::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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" ); - TQT_BASE_OBJECT_NAME::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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" ); - TQT_BASE_OBJECT_NAME::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); @@ -589,7 +589,7 @@ void View::Private::initActions() actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); - TQT_BASE_OBJECT_NAME::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); @@ -603,7 +603,7 @@ void View::Private::initActions() actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); - TQT_BASE_OBJECT_NAME::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); @@ -621,7 +621,7 @@ void View::Private::initActions() actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); - TQT_BASE_OBJECT_NAME::connect(actions->bgColor, TQT_SIGNAL( activated() ), + TQObject::connect(actions->bgColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(view), TQT_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); @@ -656,14 +656,14 @@ void View::Private::initActions() actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, ac, "borderColor" ); - TQT_BASE_OBJECT_NAME::connect( actions->borderColor, TQT_SIGNAL( activated() ), + TQObject::connect( actions->borderColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(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." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), + TQObject::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), @@ -924,7 +924,7 @@ void View::Private::initActions() actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); - TQT_BASE_OBJECT_NAME::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); @@ -939,13 +939,13 @@ void View::Private::initActions() actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- @@ -1013,11 +1013,11 @@ void View::Private::initActions() ((TDESelectAction*) actions->formulaSelection)->setItems( lst ); actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); - TQT_BASE_OBJECT_NAME::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), + TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(view), TQT_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); - TQT_BASE_OBJECT_NAME::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), + TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), @@ -1074,21 +1074,21 @@ void View::Private::initActions() actions->showStatusBar = new TDEToggleAction( i18n("Show Status Bar"), 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); - TQT_BASE_OBJECT_NAME::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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")); - TQT_BASE_OBJECT_NAME::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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")); - TQT_BASE_OBJECT_NAME::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); @@ -1099,43 +1099,43 @@ void View::Private::initActions() // -- running calculation actions -- actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); - TQT_BASE_OBJECT_NAME::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(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"); - TQT_BASE_OBJECT_NAME::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); actions->calcCountA->setToolTip(i18n("Calculate using the countA.")); @@ -1823,17 +1823,17 @@ View::View( TQWidget *_parent, const char *_name, connect( d->canvas, TQT_SIGNAL( objectSelectedChanged() ), this, TQT_SLOT( objectSelectedChanged() ) ); - TQT_BASE_OBJECT_NAME::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); + TQObject::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); + TQObject::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), + TQObject::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), this, TQT_SLOT( handleDamages( const TQValueList<Damage*>& ) ) ); //KoView::setZoom( doc()->zoomedResolutionY() /* KoView only supports one zoom */ ); // initial value @@ -1989,12 +1989,12 @@ void View::initView() d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), + TQObject::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); + TQObject::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), this, TQT_SLOT( moveSheet( unsigned, unsigned ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), + TQObject::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), this, TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), + TQObject::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotRename() ) ); d->viewLayout->setColStretch( 1, 10 ); @@ -2014,8 +2014,8 @@ void View::initView() connect(d->calcLabel ,TQT_SIGNAL(itemPressed( int )),this,TQT_SLOT(statusBarClicked(int))); // signal slot - TQT_BASE_OBJECT_NAME::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); - TQT_BASE_OBJECT_NAME::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); + TQObject::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); + TQObject::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); } @@ -2303,26 +2303,26 @@ void View::startKSpell() d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( death() ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int) ), this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int) ), this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( spellCheckerDone( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); } @@ -3726,31 +3726,31 @@ void View::addSheet( Sheet * _t ) insertSheet( _t ); // Connect some signals - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), TQT_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), TQT_SLOT( slotUpdateHBorder( Sheet * ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), TQT_SLOT( slotUpdateVBorder( Sheet * ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), this, TQT_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), this, TQT_SLOT( slotSheetHidden( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), this, TQT_SLOT( slotSheetShown( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), this, TQT_SLOT( slotSheetRemoved( Sheet* ) ) ); // ########### Why do these signals not send a pointer to the sheet? // This will lead to bugs. - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), TQT_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); if ( !d->loading ) updateBorderButton(); @@ -5709,7 +5709,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); d->popupColumn->popup( _point ); } @@ -5804,7 +5804,7 @@ void View::popupRowMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); d->popupRow->popup( _point ); } @@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( ) } d->popupListChoose->popup( p2 ); - TQT_BASE_OBJECT_NAME::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), + TQObject::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotItemSelected( int ) ) ); } @@ -6032,7 +6032,7 @@ void View::openPopupMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); } } |