diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 7c71ab86d1f7e387fc3df63b48df07231f111862 (patch) | |
| tree | 30ba2d2f840ff5fd458b6113e9c3f2e8a71d510d /kspread | |
| parent | afbfdc507bfaafc8824a9808311d57a9ece87510 (diff) | |
| download | koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.tar.gz koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kspread')
42 files changed, 310 insertions, 310 deletions
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html index 586c9d68..0bfb8a3b 100644 --- a/kspread/DESIGN.html +++ b/kspread/DESIGN.html @@ -353,7 +353,7 @@ to follow its algorithm from there.</p> based on Polish notation. Instead of ordering the tokens in suffix Polish form, the parser (which is also the code generator) simply outputs byte codes. In its operation, the parser requires the knowledge of operator -precedence to correctly translate untqparenthesized infix expression and +precedence to correctly translate unparenthesized infix expression and thus requires the use of a syntax stack.</p> <p>The parser algorithm is given as follows:</p> @@ -376,7 +376,7 @@ Step 4: If it is an operator<br> <p>The reduce rules are:</p> <p>Rule A: <i>function argument</i>: -if token is semicolon or right tqparenthesis, +if token is semicolon or right parenthesis, if syntax stack looks as: <ul type="square"> <li>non-operator <--- top</li> @@ -422,7 +422,7 @@ then reduce to:<br> </ul> </p> -<p>Rule D: tqparenthesis removal<br> +<p>Rule D: parenthesis removal<br> if syntax stack looks as:<br> <ul type="square"> <li>operator (</li> diff --git a/kspread/KSpreadViewIface.cc b/kspread/KSpreadViewIface.cc index 95eeda3a..fab646f9 100644 --- a/kspread/KSpreadViewIface.cc +++ b/kspread/KSpreadViewIface.cc @@ -442,9 +442,9 @@ void ViewIface::sortDec() m_view->sortDec(); } -void ViewIface::tqlayoutDlg() +void ViewIface::layoutDlg() { - m_view->tqlayoutDlg(); + m_view->layoutDlg(); } diff --git a/kspread/KSpreadViewIface.h b/kspread/KSpreadViewIface.h index f41a5217..090e8967 100644 --- a/kspread/KSpreadViewIface.h +++ b/kspread/KSpreadViewIface.h @@ -132,7 +132,7 @@ k_dcop: void subtotals(); void sortInc(); void sortDec(); - void tqlayoutDlg(); + void layoutDlg(); void increaseFontSize(); void decreaseFontSize(); diff --git a/kspread/commands.cc b/kspread/commands.cc index 9a7ceda4..a4788bda 100644 --- a/kspread/commands.cc +++ b/kspread/commands.cc @@ -269,7 +269,7 @@ SheetPropertiesCommand::SheetPropertiesCommand( Doc* d, Sheet* s ) { sheet = s; doc = d; - oldDirection = newDirection = sheet->tqlayoutDirection(); + oldDirection = newDirection = sheet->layoutDirection(); oldAutoCalc = newAutoCalc = sheet->getAutoCalc(); oldShowGrid = newShowGrid = sheet->getShowGrid(); oldShowPageBorders = newShowPageBorders = sheet->isShowPageBorders(); diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui index 525b83f3..6e0b3c0d 100644 --- a/kspread/dialogs/SheetSelectWidget.ui +++ b/kspread/dialogs/SheetSelectWidget.ui @@ -254,7 +254,7 @@ It is even possible to print a sheet more than once. Just insert the desired she <tabstop>ButtonMoveDown</tabstop> <tabstop>ButtonMoveBottom</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 3bb6b78a..6e7f7403 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -219,7 +219,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 6b5c233b..fcbb734e 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -182,7 +182,7 @@ GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg ) m_parentBox->insertStringList( tmp ); if ( m_dlg->getStyle()->tqparent() ) - m_parentBox->setCurrentText( m_dlg->getStyle()->tqparentName() ); + m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() ); else { m_parentBox->setCurrentText( i18n( "<None>" ) ); @@ -219,16 +219,16 @@ void GeneralTab::slotNameChanged() checkName(); } -void GeneralTab::slotNewParent( const TQString & tqparentName ) +void GeneralTab::slotNewParent( const TQString & parentName ) { kdDebug() << "New Parent" << endl; - if ( !checkParent( tqparentName ) ) + if ( !checkParent( parentName ) ) return; - if ( tqparentName.isEmpty() || tqparentName == i18n( "<None>" ) ) + if ( parentName.isEmpty() || parentName == i18n( "<None>" ) ) m_dlg->getStyle()->setParent( 0 ); else - m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( tqparentName ) ); + m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) ); // Set difference to new tqparent, set GUI to tqparent values, add changes made before // m_dlg->initGUI(); @@ -248,17 +248,17 @@ bool GeneralTab::checkName() return true; } -bool GeneralTab::checkParent( const TQString & tqparentName ) +bool GeneralTab::checkParent( const TQString & parentName ) { - if ( m_dlg->getStyle()->tqparentName() != tqparentName - && m_parentBox->isEnabled() && tqparentName != i18n( "<None>" ) && !tqparentName.isEmpty() ) + if ( m_dlg->getStyle()->parentName() != parentName + && m_parentBox->isEnabled() && parentName != i18n( "<None>" ) && !parentName.isEmpty() ) { - if ( m_nameEdit->text() == tqparentName ) + if ( m_nameEdit->text() == parentName ) { KMessageBox::sorry( this, i18n( "A style cannot inherit from itself." ) ); return false; } - if ( !m_dlg->checkCircle( m_nameEdit->text(), tqparentName ) ) + if ( !m_dlg->checkCircle( m_nameEdit->text(), parentName ) ) { KMessageBox::sorry( this, i18n( "The style cannot inherit from '%1' because of recursive references." ) @@ -266,7 +266,7 @@ bool GeneralTab::checkParent( const TQString & tqparentName ) return false; } - CustomStyle * p = m_dlg->getStyleManager()->style( tqparentName ); + CustomStyle * p = m_dlg->getStyleManager()->style( parentName ); if ( !p ) { diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index a16e409d..ddb364e7 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -145,7 +145,7 @@ class GeneralTab : public TQWidget bool apply( CustomStyle * style ); protected slots: - void slotNewParent( const TQString & tqparentName ); + void slotNewParent( const TQString & parentName ); void slotNameChanged(); private: @@ -156,7 +156,7 @@ class GeneralTab : public TQWidget TQString m_name; TQString m_parent; - bool checkParent( const TQString & tqparentName ); + bool checkParent( const TQString & parentName ); bool checkName(); }; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h index a7316f22..cd3537a3 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.h +++ b/kspread/dialogs/kspread_dlg_paperlayout.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __kspread_dlg_papertqlayout__ -#define __kspread_dlg_papertqlayout__ +#ifndef __kspread_dlg_paperlayout__ +#define __kspread_dlg_paperlayout__ #include <kdialogbase.h> #include <KoPageLayoutDia.h> diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index ac7cd187..3b94da54 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -79,10 +79,10 @@ SortDialog::SortDialog( View * tqparent, const char * name, //---------------- Sort Layout & Header Row/Column Toggle //Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection) - TQGroupBox* tqlayoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "tqlayoutGroup"); - tqlayoutGroup->setTitle( i18n("Layout") ); + TQGroupBox* layoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "layoutGroup"); + layoutGroup->setTitle( i18n("Layout") ); - TQHButtonGroup * orientationGroup = new TQHButtonGroup( tqlayoutGroup, "orientationGroup" ); + TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" ); orientationGroup->setLineWidth(0); orientationGroup->setMargin(0); orientationGroup->tqlayout()->setMargin(0); @@ -94,10 +94,10 @@ SortDialog::SortDialog( View * tqparent, const char * name, m_sortRow->setText( i18n( "Sort &Columns" ) ); //First row / column contains header toggle - m_firstRowOrColHeader = new TQCheckBox( tqlayoutGroup, "m_copyLayout" ); + m_firstRowOrColHeader = new TQCheckBox( layoutGroup, "m_copyLayout" ); //m_firstRowOrColHeader->setText( i18n( "&First row contains headers" ) ); m_firstRowOrColHeader->setChecked(true); - page1Layout->addWidget(tqlayoutGroup,0,0); + page1Layout->addWidget(layoutGroup,0,0); //---------------- diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui index 9cfb871a..cb73b12d 100644 --- a/kspread/dialogs/kspreadsubtotal.ui +++ b/kspread/dialogs/kspreadsubtotal.ui @@ -218,5 +218,5 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index 6438278e..df2ff211 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -407,5 +407,5 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index bdf9bf77..0768d4f7 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -176,5 +176,5 @@ Note that you can print it even if the cell is protected</string> <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index efd30b03..2f345103 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -63,7 +63,7 @@ void SheetPropertiesDialog::slotDefault() setCapitalizeFirstLetter( false ); } -Sheet::LayoutDirection SheetPropertiesDialog::tqlayoutDirection() const +Sheet::LayoutDirection SheetPropertiesDialog::layoutDirection() const { if( d->directionComboBox->currentText() == i18n( "Left to Right" ) ) return Sheet::LeftToRight; diff --git a/kspread/dialogs/sheet_properties.h b/kspread/dialogs/sheet_properties.h index b2f364f4..6ab51a40 100644 --- a/kspread/dialogs/sheet_properties.h +++ b/kspread/dialogs/sheet_properties.h @@ -41,7 +41,7 @@ public: virtual void slotDefault(); - Sheet::LayoutDirection tqlayoutDirection() const; + Sheet::LayoutDirection layoutDirection() const; void setLayoutDirection( Sheet::LayoutDirection dir ); diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index f1fe56c8..0750b8a9 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -250,8 +250,8 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kspread/formula.cc b/kspread/formula.cc index 17b95497..efeec46e 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -966,7 +966,7 @@ void Formula::compile( const Tokens& tokens ) const } } - // rule for function call with tqparentheses, but without argument + // rule for function call with parentheses, but without argument // e.g. "2*PI()" if( !ruleFound ) if( syntaxStack.itemCount() >= 3 ) @@ -987,7 +987,7 @@ void Formula::compile( const Tokens& tokens ) const } } - // rule for tqparenthesis: ( Y ) -> Y + // rule for parenthesis: ( Y ) -> Y if( !ruleFound ) if( syntaxStack.itemCount() >= 3 ) { diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 84c84fca..96d4836a 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -635,7 +635,7 @@ void Canvas::scrollToCell(TQPoint location) const // xpos is the position of the cell in the current window in unzoomed // document coordinates. double xpos; - if ( sheet->tqlayoutDirection()==Sheet::LeftToRight ) + if ( sheet->layoutDirection()==Sheet::LeftToRight ) xpos = sheet->dblColumnPos( location.x() ) - xOffset(); else xpos = unzoomedWidth - sheet->dblColumnPos( location.x() ) + xOffset(); @@ -648,7 +648,7 @@ void Canvas::scrollToCell(TQPoint location) const //kdDebug(36001) << "Canvas::scrollToCell : height=" << height() << endl; //kdDebug(36001) << "Canvas::scrollToCell : width=" << width() << endl; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) { + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { // Right to left sheet. double minX = unzoomedWidth - 100.0; // less than that, we scroll @@ -730,7 +730,7 @@ void Canvas::slotScrollHorz( int _value ) kdDebug(36001) << "slotScrollHorz: value = " << _value << endl; //kdDebug(36001) << kdBacktrace() << endl; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) _value = horzScrollBar()->maxValue() - _value; double unzoomedValue = d->view->doc()->unzoomItX( _value ); @@ -778,7 +778,7 @@ void Canvas::slotScrollHorz( int _value ) kdDebug(36001) << "slotScrollHorz(): XOffset after setting: " << d->xOffset << endl; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) dx = -dx; scroll( dx, 0 ); @@ -855,7 +855,7 @@ void Canvas::slotMaxColumn( int _max_column ) horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( xpos + xOffset() ) ); - if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft ) + if ( activeSheet()->layoutDirection()==Sheet::RightToLeft ) horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue ); } @@ -1023,7 +1023,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) double dwidth = d->view->doc()->unzoomItX( width() ); double ev_PosX; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); } @@ -1059,7 +1059,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) //tqshape to a resize arrow if (highlightRangeSizeGripAt(ev_PosX,ev_PosY)) { - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) setCursor( sizeBDiagCursor ); else setCursor( sizeFDiagCursor ); @@ -1090,7 +1090,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) { Cell *cell = sheet->visibleCellAt( col, row ); TQString anchor; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { anchor = cell->testAnchor( d->view->doc()->zoomItX( cell->dblWidth() - ev_PosX + xpos ), d->view->doc()->zoomItY( ev_PosY - ypos ) ); @@ -1120,7 +1120,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) if ( !sheet->isProtected() ) { - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) setCursor( sizeBDiagCursor ); else setCursor( sizeFDiagCursor ); @@ -1381,7 +1381,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) double dwidth = d->view->doc()->unzoomItX( width() ); double ev_PosX; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); } @@ -1649,7 +1649,7 @@ void Canvas::paintEvent( TQPaintEvent* _ev ) double dwidth = d->view->doc()->unzoomItX( width() ); KoRect rect = d->view->doc()->unzoomRect( _ev->rect() & TQWidget::rect() ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) rect.moveBy( -xOffset(), yOffset() ); else rect.moveBy( xOffset(), yOffset() ); @@ -1662,7 +1662,7 @@ void Canvas::paintEvent( TQPaintEvent* _ev ) int right_col; //Philipp: I don't know why we need the +1, but otherwise we don't get it correctly //Testcase: Move a dialog slowly up left. Sometimes the top/left most points are not painted - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { right_col = sheet->leftColumn( dwidth - tl.x(), tmp ); left_col = sheet->rightColumn( dwidth - br.x() + 1.0 ); @@ -1731,7 +1731,7 @@ void Canvas::dragMoveEvent( TQDragMoveEvent * _ev ) TQRect r1 ((int) xpos - 1, (int) ypos - 1, (int) width + 3, (int) height + 3); double ev_PosX; - if (sheet->tqlayoutDirection()==Sheet::RightToLeft) + if (sheet->layoutDirection()==Sheet::RightToLeft) ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); else ev_PosX = d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); @@ -1769,7 +1769,7 @@ void Canvas::dropEvent( TQDropEvent * _ev ) TQRect r1 ((int) xpos - 1, (int) ypos - 1, (int) width + 3, (int) height + 3); double ev_PosX; - if (sheet->tqlayoutDirection()==Sheet::RightToLeft) + if (sheet->layoutDirection()==Sheet::RightToLeft) ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); else ev_PosX = d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset(); @@ -1855,12 +1855,12 @@ void Canvas::resizeEvent( TQResizeEvent* _ev ) // workaround to allow horizontal resizing and zoom changing when sheet // direction and interface direction don't match (e.g. an RTL sheet on an // LTR interface) - if ( activeSheet() && activeSheet()->tqlayoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() ) + if ( activeSheet() && activeSheet()->layoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() ) { int dx = _ev->size().width() - _ev->oldSize().width(); scroll(dx, 0); } - else if ( activeSheet() && activeSheet()->tqlayoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() ) + else if ( activeSheet() && activeSheet()->layoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() ) { int dx = _ev->size().width() - _ev->oldSize().width(); scroll(-dx, 0); @@ -1875,7 +1875,7 @@ void Canvas::resizeEvent( TQResizeEvent* _ev ) d->view->doc()->zoomItX( activeSheet()->sizeMaxX() ) ) { horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( activeSheet()->sizeMaxX() - ev_Width ) ); - if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft ) + if ( activeSheet()->layoutDirection()==Sheet::RightToLeft ) horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue ); } } @@ -1888,7 +1888,7 @@ void Canvas::resizeEvent( TQResizeEvent* _ev ) int( d->view->doc()->zoomItX( activeSheet()->sizeMaxX() ) - ev_Width ) ) { horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( activeSheet()->sizeMaxX() - ev_Width ) ); - if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft ) + if ( activeSheet()->layoutDirection()==Sheet::RightToLeft ) horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue ); } } @@ -2092,13 +2092,13 @@ void Canvas::processArrowKey( TQKeyEvent *event) direction = KSpread::Top; break; case Key_Left: - if (activeSheet()->tqlayoutDirection()==Sheet::RightToLeft) + if (activeSheet()->layoutDirection()==Sheet::RightToLeft) direction = KSpread::Right; else direction = KSpread::Left; break; case Key_Right: - if (activeSheet()->tqlayoutDirection()==Sheet::RightToLeft) + if (activeSheet()->layoutDirection()==Sheet::RightToLeft) direction = KSpread::Left; else direction = KSpread::Right; @@ -2541,7 +2541,7 @@ bool Canvas::processControlArrowKey( TQKeyEvent *event ) //Ctrl+Key_Left case Key_Left: - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { cell = sheet->cellAt( marker.x(), marker.y() ); if ( (cell != NULL) && (!cell->isEmpty()) && (marker.x() != KS_colMax)) @@ -2635,7 +2635,7 @@ bool Canvas::processControlArrowKey( TQKeyEvent *event ) //Ctrl+Key_Right case Key_Right: - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { cell = sheet->cellAt( marker.x(), marker.y() ); if ( (cell != NULL) && (!cell->isEmpty()) && (marker.x() != 1)) @@ -3209,7 +3209,7 @@ void Canvas::speakCell(TQWidget* w, const TQPoint& p, uint flags) TQPoint wp = w->mapFromGlobal(p); double tmp; double posX; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { double dwidth = d->view->doc()->unzoomItX( width() ); posX = dwidth - d->view->doc()->unzoomItX( wp.x() ); @@ -3752,7 +3752,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys ) double xpos = sheet->dblColumnPos( markerColumn() ) - xOffset(); - Sheet::LayoutDirection sheetDir = sheet->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = sheet->layoutDirection(); bool rtlText = cell->strOutText().isRightToLeft(); // if sheet and cell direction don't match, then the editor's location @@ -4113,7 +4113,7 @@ void Canvas::paintUpdates() if (!cell->isDefault()) { if (cell->calcDirtyFlag()) cell->calc(); - if (cell->tqlayoutDirtyFlag()) cell->makeLayout( painter, x, y ); + if (cell->layoutDirtyFlag()) cell->makeLayout( painter, x, y ); } /* bool paintBordersBottom = false; @@ -4406,7 +4406,7 @@ void Canvas::paintNormalMarker(TQPainter& painter, const KoRect &viewRect) painter.drawLine( d->view->doc()->zoomItX( left ) - l, d->view->doc()->zoomItY( top ), d->view->doc()->zoomItX( right ) + l, d->view->doc()->zoomItY( top ) ); } - if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft ) + if ( activeSheet()->layoutDirection()==Sheet::RightToLeft ) { if ( paintRight ) { @@ -4437,7 +4437,7 @@ void Canvas::paintNormalMarker(TQPainter& painter, const KoRect &viewRect) } } } - else // activeSheet()->tqlayoutDirection()==Sheet::LeftToRight + else // activeSheet()->layoutDirection()==Sheet::LeftToRight { if ( paintLeft ) { @@ -4475,7 +4475,7 @@ void Canvas::sheetAreaToRect(const TQRect& sheetArea, KoRect& rect) { Sheet* sheet=activeSheet(); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { rect.setLeft(sheet->dblColumnPos( sheetArea.right()+1 ) ); rect.setRight(sheet->dblColumnPos( sheetArea.left() )); @@ -4503,7 +4503,7 @@ void Canvas::sheetAreaToVisibleRect( const TQRect& sheetArea, double xpos; double x; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { xpos = dwidth - sheet->dblColumnPos( sheetArea.right() ) + xOffset(); x = dwidth - sheet->dblColumnPos( sheetArea.left() ) + xOffset(); @@ -4526,7 +4526,7 @@ void Canvas::sheetAreaToVisibleRect( const TQRect& sheetArea, double h = ( y - ypos ) + th; /* left, top, right, bottom */ - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { visibleRect.setLeft(xpos - tw ); visibleRect.setRight(xpos - tw + w ); @@ -4562,7 +4562,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker, double xpos; double x; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { xpos = dWidth - sheet->dblColumnPos( marker.right() ) + xOffset(); x = dWidth - sheet->dblColumnPos( marker.left() ) + xOffset(); @@ -4584,7 +4584,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker, double h = ( y - ypos ) + th; //left, top, right, bottom - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { positions[0] = xpos - tw; positions[2] = xpos - tw + w; @@ -4608,7 +4608,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker, (bottom >= viewRect.top()) && (top <= viewRect.bottom()); paintSides[1] = (viewRect.top() <= top) && (top <= viewRect.bottom()) && (right >= viewRect.left()) && (left <= viewRect.right()); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) paintSides[2] = (viewRect.left() <= right ) && (right - 1 <= viewRect.right()) && (bottom >= viewRect.top()) && (top <= viewRect.bottom()); @@ -5051,7 +5051,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) { m_lSize = new TQLabel( m_pCanvas ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) m_lSize->setGeometry( m_pCanvas->width() - len - 5, y + 3, len + 2, hei + 2 ); else @@ -5064,7 +5064,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) } else { - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) m_lSize->setGeometry( m_pCanvas->width() - len - 5, y + 3, len + 2, hei + 2 ); else @@ -5239,7 +5239,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) double ev_PosX; double dWidth = m_pCanvas->d->view->doc()->unzoomItX( width() ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); else ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); @@ -5250,7 +5250,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) double x; const double unzoomedPixel = m_pCanvas->d->view->doc()->unzoomItX( 1 ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { int tmpCol = sheet->leftColumn( m_pCanvas->xOffset(), x ); @@ -5319,7 +5319,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) { // Determine the column to resize double tmp; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { m_iResizedColumn = sheet->leftColumn( ev_PosX - 1, tmp ); // kdDebug() << "RColumn: " << m_iResizedColumn << ", PosX: " << ev_PosX << endl; @@ -5424,7 +5424,7 @@ void HBorder::mouseReleaseEvent( TQMouseEvent * _ev ) double width = 0.0; double x; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); else ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); @@ -5545,7 +5545,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev ) double dWidth = m_pCanvas->d->view->doc()->unzoomItX( width() ); double ev_PosX; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); else ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset(); @@ -5571,7 +5571,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev ) newAnchor.setX( m_iSelectionAnchor ); m_pView->selectionInfo()->update(newMarker); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { if ( _ev->pos().x() < width() - m_pCanvas->width() ) { @@ -5607,7 +5607,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev ) const double unzoomedPixel = m_pCanvas->d->view->doc()->unzoomItX( 1 ); double x; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { int tmpCol = sheet->leftColumn( m_pCanvas->xOffset(), x ); @@ -5685,12 +5685,12 @@ void HBorder::resizeEvent( TQResizeEvent* _ev ) // workaround to allow horizontal resizing and zoom changing when sheet // direction and interface direction don't match (e.g. an RTL sheet on an // LTR interface) - if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->tqlayoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() ) + if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->layoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() ) { int dx = _ev->size().width() - _ev->oldSize().width(); scroll(dx, 0); } - else if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->tqlayoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() ) + else if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->layoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() ) { int dx = _ev->size().width() - _ev->oldSize().width(); scroll(-dx, 0); @@ -5710,7 +5710,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) if ( !firstTime ) painter.drawLine( m_iResizePos, 0, m_iResizePos, m_pCanvas->height() ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) m_iResizePos = mouseX + m_pCanvas->width() - width(); else m_iResizePos = mouseX; @@ -5718,7 +5718,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) // Dont make the column have a width < 2 pixels. int x = m_pCanvas->d->view->doc()->zoomItX( sheet->dblColumnPos( m_iResizedColumn ) - m_pCanvas->xOffset() ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { x = m_pCanvas->width() - x; @@ -5738,7 +5738,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) TQString tmpSize; if ( m_iResizePos != x ) tmpSize = i18n("Width: %1 %2") - .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->tqlayoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), + .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), m_pView->doc()->unit() ))) .tqarg( m_pView->doc()->unitName() ); else @@ -5753,7 +5753,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) { m_lSize = new TQLabel( m_pCanvas ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) m_lSize->setGeometry( x - len - 5, 3, len + 2, hei + 2 ); else m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 ); @@ -5765,7 +5765,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) } else { - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) m_lSize->setGeometry( x - len - 5, 3, len + 2, hei + 2 ); else m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 ); @@ -5809,7 +5809,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) double xPos; int x; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { //Get the left column and the current x-position x = sheet->leftColumn( int( m_pCanvas->d->view->doc()->unzoomItX( width() ) - m_pCanvas->d->view->doc()->unzoomItX( _ev->rect().x() ) + m_pCanvas->xOffset() ), xPos ); @@ -5835,7 +5835,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) TQFont boldFont = normalFont; boldFont.setBold( true ); - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { if ( x > KS_colMax ) x = KS_colMax; @@ -6014,7 +6014,7 @@ void ToolTip::maybeTip( const TQPoint& p ) double ypos, xpos; double dwidth = m_canvas->doc()->unzoomItX( m_canvas->width() ); int col; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) col = sheet->leftColumn( (dwidth - m_canvas->doc()->unzoomItX( p.x() ) + m_canvas->xOffset()), xpos ); else @@ -6085,7 +6085,7 @@ void ToolTip::maybeTip( const TQPoint& p ) TQRect marker; bool insideMarker = false; - if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( sheet->layoutDirection()==Sheet::RightToLeft ) { KoRect unzoomedMarker( dwidth - u - xpos + m_canvas->xOffset(), ypos - m_canvas->yOffset(), diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index 9314d220..c3c520f8 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -2177,7 +2177,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, Q_ASSERT(isDefault() || (((cellRef.x() == d->column) && (cellRef.y() == d->row)))); - Sheet::LayoutDirection sheetDir = format()->sheet()->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); double left = coordinate.x(); @@ -2790,7 +2790,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, */ Doc* doc = sheet()->doc(); - Sheet::LayoutDirection sheetDir = format()->sheet()->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); bool paintingToExternalDevice = painter.tqdevice()->isExtDev(); // Each cell is responsible for drawing it's top and left portions @@ -3039,7 +3039,7 @@ void Cell::paintCommentIndicator( TQPainter& painter, // Get the triangle. TQPointArray point( 3 ); - if ( format()->sheet()->tqlayoutDirection()==Sheet::RightToLeft ) { + if ( format()->sheet()->layoutDirection()==Sheet::RightToLeft ) { point.setPoint( 0, doc->zoomItX( cellRect.x() + 6.0 ), doc->zoomItY( cellRect.y() ) ); point.setPoint( 1, doc->zoomItX( cellRect.x() ), @@ -3089,7 +3089,7 @@ void Cell::paintFormulaIndicator( TQPainter& painter, // Get the triangle... TQPointArray point( 3 ); - if ( format()->sheet()->tqlayoutDirection()==Sheet::RightToLeft ) { + if ( format()->sheet()->layoutDirection()==Sheet::RightToLeft ) { point.setPoint( 0, doc->zoomItX( cellRect.right() - 6.0 ), doc->zoomItY( cellRect.bottom() ) ); point.setPoint( 1, doc->zoomItX( cellRect.right() ), @@ -3474,7 +3474,7 @@ void Cell::paintPageBorders( TQPainter& painter, SheetPrint* print = format()->sheet()->print(); - Sheet::LayoutDirection sheetDir = format()->sheet()->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); Doc* doc = sheet()->doc(); int zcellRect_left = doc->zoomItX (cellRect.left()); @@ -3554,7 +3554,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, Doc * doc = sheet()->doc(); - Sheet::LayoutDirection sheetDir = format()->sheet()->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); // compute zoomed rectangles // I don't use KoRect, because that ends up producing lots of warnings @@ -7264,7 +7264,7 @@ bool Cell::calcDirtyFlag() return isFormula() ? testFlag( Flag_CalcDirty ) : false; } -bool Cell::tqlayoutDirtyFlag() const +bool Cell::layoutDirtyFlag() const { return testFlag( Flag_LayoutDirty ); } diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h index e7d4e2bb..24662186 100644 --- a/kspread/kspread_cell.h +++ b/kspread/kspread_cell.h @@ -681,7 +681,7 @@ public: * some cell specific format value like font or text change. */ void setLayoutDirtyFlag( bool format = false ); - bool tqlayoutDirtyFlag() const; + bool layoutDirtyFlag() const; void clearDisplayDirtyFlag(); void setDisplayDirtyFlag(); diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 6a40cbd9..7340feda 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -169,8 +169,8 @@ public: TQValueList<Doc*> Doc::Private::s_docs; int Doc::Private::s_docId = 0; -Doc::Doc( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ) +Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) { d = new Private; d->m_loadingInfo = 0L; @@ -276,7 +276,7 @@ TQValueList<Doc*> Doc::documents() return Private::s_docs; } -bool Doc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) +bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget) { // ElapsedTime et( " initDoc " ); @@ -311,7 +311,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) dlgtype = KoTemplateChooseDia::OnlyTemplates; ret = KoTemplateChooseDia::choose( Factory::global(), f, - dlgtype, "kspread_template", tqparentWidget ); + dlgtype, "kspread_template", parentWidget ); if ( ret == KoTemplateChooseDia::File ) { diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h index 57f95d8e..f2b7fa02 100644 --- a/kspread/kspread_doc.h +++ b/kspread/kspread_doc.h @@ -120,7 +120,7 @@ public: /** * Creates a new document. */ - Doc( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, + Doc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); /** @@ -445,7 +445,7 @@ public: virtual void addView( KoView *_view ); - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); /** * Change the zoom factor to @p z (e.g. 150 for 150%) diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 85690b13..1ed83ac2 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -195,7 +195,7 @@ void FormulaEditorHighlighter::handleBrace( uint index ) int opType = token.asOperator(); bool highlightBrace=false; - //Check where the cursor is in relation to this left or right tqparenthesis token. + //Check where the cursor is in relation to this left or right parenthesis token. //Only one pair of braces should be highlighted at a time, and if the cursor //is between two braces, the inner-most pair should be highlighted. diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc index dd000d2e..a1ef3484 100644 --- a/kspread/kspread_factory.cc +++ b/kspread/kspread_factory.cc @@ -53,11 +53,11 @@ Factory::~Factory() s_dcopObject = 0L; } -KParts::Part* Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - Doc *doc = new Doc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); + Doc *doc = new Doc( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kspread/kspread_factory.h b/kspread/kspread_factory.h index bd2c896a..ddf46099 100644 --- a/kspread/kspread_factory.h +++ b/kspread/kspread_factory.h @@ -36,7 +36,7 @@ public: Factory( TQObject* tqparent = 0, const char* name = 0 ); ~Factory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index 1b0e6d7a..95898cd3 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -369,8 +369,8 @@ TQDomElement Format::saveFormat( TQDomDocument& doc, bool force, bool copy ) con } else { - if ( m_pStyle->tqparent() && m_pStyle->tqparentName().length() > 0 ) - format.setAttribute( "tqparent", m_pStyle->tqparentName() ); + if ( m_pStyle->tqparent() && m_pStyle->parentName().length() > 0 ) + format.setAttribute( "tqparent", m_pStyle->parentName() ); } if ( hasProperty( PAlign, true ) || hasNoFallBackProperties( PAlign ) || force ) diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 70323124..43e4bbec 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -268,7 +268,7 @@ public: TQString name; int id; - Sheet::LayoutDirection tqlayoutDirection; + Sheet::LayoutDirection layoutDirection; // true if sheet is hidden bool hide; @@ -365,7 +365,7 @@ Sheet::Sheet (Map* map, d->id = s_id++; s_mapSheets->insert( d->id, this ); - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; d->defaultFormat = new Format (this, d->workbook->doc()->styleManager()->defaultStyle()); d->emptyPen.setStyle( Qt::NoPen ); @@ -452,19 +452,19 @@ int Sheet::id() const return d->id; } -Sheet::LayoutDirection Sheet::tqlayoutDirection() const +Sheet::LayoutDirection Sheet::layoutDirection() const { - return d->tqlayoutDirection; + return d->layoutDirection; } void Sheet::setLayoutDirection( LayoutDirection dir ) { - d->tqlayoutDirection = dir; + d->layoutDirection = dir; } bool Sheet::isRightToLeft() const { - return d->tqlayoutDirection == RightToLeft; + return d->layoutDirection == RightToLeft; } bool Sheet::isHidden() const @@ -5921,7 +5921,7 @@ TQDomElement Sheet::saveXML( TQDomDocument& dd ) //Laurent: for oasis format I think that we must use style:direction... - sheet.setAttribute( "tqlayoutDirection", (d->tqlayoutDirection == RightToLeft) ? "rtl" : "ltr" ); + sheet.setAttribute( "layoutDirection", (d->layoutDirection == RightToLeft) ? "rtl" : "ltr" ); sheet.setAttribute( "columnnumber", (int)d->showColumnNumber); sheet.setAttribute( "borders", (int)d->showPageBorders); sheet.setAttribute( "hide", (int)d->hide); @@ -6390,7 +6390,7 @@ TQString Sheet::getPart( const TQDomNode & part ) bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& oasisContext, TQDict<Style>& styleMap ) { - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; if ( sheetElement.hasAttributeNS( KoXmlNS::table, "style-name" ) ) { TQString stylename = sheetElement.attributeNS( KoXmlNS::table, "style-name", TQString() ); @@ -6594,7 +6594,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) if ( styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { kdDebug()<<"styleStack.hasAttribute( style:writing-mode ) :"<<styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" )<<endl; - d->tqlayoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft; + d->layoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft; //TODO //<value>lr-tb</value> //<value>rl-tb</value> @@ -7638,22 +7638,22 @@ bool Sheet::loadXML( const TQDomElement& sheet ) } bool detectDirection = true; - d->tqlayoutDirection = LeftToRight; - TQString tqlayoutDir = sheet.attribute( "tqlayoutDirection" ); - if( !tqlayoutDir.isEmpty() ) + d->layoutDirection = LeftToRight; + TQString layoutDir = sheet.attribute( "layoutDirection" ); + if( !layoutDir.isEmpty() ) { - if( tqlayoutDir == "rtl" ) + if( layoutDir == "rtl" ) { detectDirection = false; - d->tqlayoutDirection = RightToLeft; + d->layoutDirection = RightToLeft; } - else if( tqlayoutDir == "ltr" ) + else if( layoutDir == "ltr" ) { detectDirection = false; - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; } else - kdDebug()<<" Direction not implemented : "<<tqlayoutDir<<endl; + kdDebug()<<" Direction not implemented : "<<layoutDir<<endl; } if( detectDirection ) checkContentDirection( d->name ); diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index 1ba2e3f5..6266d382 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -307,7 +307,7 @@ public: /** * Returns the tqlayout direction of the sheet. */ - LayoutDirection tqlayoutDirection() const; + LayoutDirection layoutDirection() const; /** * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew @@ -468,7 +468,7 @@ public: void adjustSizeMaxY ( double _y ); /** - * Sets the @ref Cell::tqlayoutDirtyFlag in all cells. + * Sets the @ref Cell::layoutDirtyFlag in all cells. */ void setLayoutDirtyFlag(); /** diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index de8d4a17..6bb577f6 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -554,7 +554,7 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft, TQPen highlightPen; - if ( m_pSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( m_pSheet->layoutDirection()==Sheet::RightToLeft ) cell->paintCell( rect, painter, NULL, KoPoint( view.width() - xpos - col_lay->dblWidth(), ypos ), TQPoint( x, y ), diff --git a/kspread/kspread_style.h b/kspread/kspread_style.h index df1ed131..58922a06 100644 --- a/kspread/kspread_style.h +++ b/kspread/kspread_style.h @@ -262,7 +262,7 @@ public: Style * clearProperty( Properties p ); CustomStyle * tqparent() const; - TQString const & tqparentName() const { return m_parentName; } + TQString const & parentName() const { return m_parentName; } void setParent( CustomStyle * tqparent ); /** diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc index 8c4d86f5..1d570e95 100644 --- a/kspread/kspread_style_manager.cc +++ b/kspread/kspread_style_manager.cc @@ -132,8 +132,8 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles ) CustomStyle * styleData = iter.data(); if ( styleData->name() != "Default" ) - if ( !styleData->tqparent() && !styleData->tqparentName().isNull() ) - styleData->setParent( m_oasisStyles[ styleData->tqparentName() ] ); + if ( !styleData->tqparent() && !styleData->parentName().isNull() ) + styleData->setParent( m_oasisStyles[ styleData->parentName() ] ); ++iter; } @@ -209,8 +209,8 @@ bool StyleManager::loadXML( TQDomElement const & styles ) { CustomStyle * styleData = iter.data(); - if ( !styleData->tqparent() && !styleData->tqparentName().isNull() ) - styleData->setParent( m_styles[ styleData->tqparentName() ] ); + if ( !styleData->tqparent() && !styleData->parentName().isNull() ) + styleData->setParent( m_styles[ styleData->parentName() ] ); ++iter; } @@ -284,10 +284,10 @@ bool StyleManager::checkCircle( TQString const & name, TQString const & tqparent CustomStyle * s = style( tqparent ); if ( !s || s->tqparent() == 0 ) return true; - if ( s->tqparentName() == name ) + if ( s->parentName() == name ) return false; else - return checkCircle( name, s->tqparentName() ); + return checkCircle( name, s->parentName() ); } bool StyleManager::validateStyleName( TQString const & name, CustomStyle * style ) @@ -316,7 +316,7 @@ void StyleManager::changeName( TQString const & oldName, TQString const & newNam while ( iter != end ) { - if ( iter.data()->tqparentName() == oldName ) + if ( iter.data()->parentName() == oldName ) iter.data()->refreshParentName(); ++iter; @@ -365,12 +365,12 @@ TQDict<Style> StyleManager::loadOasisAutoStyles( KoOasisStyles& oasisStyles ) if ( it.current()->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) { - TQString tqparentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); - if ( m_oasisStyles.tqcontains( tqparentStyleName ) ) + TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); + if ( m_oasisStyles.tqcontains( parentStyleName ) ) { - autoStyles[name]->setParent( m_oasisStyles[tqparentStyleName] ); + autoStyles[name]->setParent( m_oasisStyles[parentStyleName] ); } - kdDebug() << "\t tqparent-style-name:" << tqparentStyleName << endl; + kdDebug() << "\t tqparent-style-name:" << parentStyleName << endl; } else { diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc index ae075fe6..f88c35fc 100644 --- a/kspread/kspread_undo.cc +++ b/kspread/kspread_undo.cc @@ -917,12 +917,12 @@ UndoCellFormat::UndoCellFormat( Doc * _doc, copyFormat( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet ); } -void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, - TQValueList<tqlayoutColumn> & listCol, - TQValueList<tqlayoutRow> & listRow, +void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, + TQValueList<layoutColumn> & listCol, + TQValueList<layoutRow> & listRow, Sheet * sheet ) { - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { delete (*it2).l; @@ -942,7 +942,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - tqlayoutColumn tmptqlayout; + layoutColumn tmptqlayout; tmptqlayout.col = i; tmptqlayout.l = new ColumnFormat( sheet, i ); tmptqlayout.l->copy( *(sheet->columnFormat( i )) ); @@ -951,7 +951,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, */ for ( int c = range.left(); c <= right; ++c ) { - tqlayoutColumn tmptqlayout; + layoutColumn tmptqlayout; tmptqlayout.col = c; tmptqlayout.l = new ColumnFormat( sheet, c ); tmptqlayout.l->copy( *(sheet->columnFormat( c )) ); @@ -966,7 +966,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, continue; } - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = c; tmptqlayout.row = cell->row(); tmptqlayout.l = new Format( sheet, 0 ); @@ -984,7 +984,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, if ( range.left() <= col && right >= col && !c->isPartOfMerged()) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = c->column(); tmptqlayout.row = c->row(); tmptqlayout.l = new Format( sheet, 0 ); @@ -998,7 +998,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - tqlayoutRow tmptqlayout; + layoutRow tmptqlayout; tmptqlayout.row = row; tmptqlayout.l = new RowFormat( sheet, row ); tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); @@ -1012,7 +1012,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, cell = sheet->getNextCellRight( cell->column(), row ); continue; } - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = cell->column(); tmptqlayout.row = row; tmptqlayout.l = new Format( sheet, 0 ); @@ -1030,7 +1030,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, if ( range.top() <= row && bottom >= row && !c->isPartOfMerged()) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = c->column(); tmptqlayout.row = c->row(); tmptqlayout.l = new Format( sheet, 0 ); @@ -1048,7 +1048,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, Cell * cell = sheet->nonDefaultCell( x, y ); if ( !cell->isPartOfMerged() ) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = x; tmptqlayout.row = y; tmptqlayout.l = new Format( sheet, 0 ); @@ -1062,7 +1062,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list, UndoCellFormat::~UndoCellFormat() { - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { delete (*it2).l; @@ -1075,7 +1075,7 @@ UndoCellFormat::~UndoCellFormat() } m_lstRedoFormats.clear(); - TQValueList<tqlayoutColumn>::Iterator it3; + TQValueList<layoutColumn>::Iterator it3; for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 ) { delete (*it3).l; @@ -1088,7 +1088,7 @@ UndoCellFormat::~UndoCellFormat() } m_lstRedoColFormats.clear(); - TQValueList<tqlayoutRow>::Iterator it4; + TQValueList<layoutRow>::Iterator it4; for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 ) { delete (*it4).l; @@ -1119,7 +1119,7 @@ void UndoCellFormat::undo() TQRect range = (*it)->rect().normalize(); if( util_isColumnSelected( range ) ) { - TQValueList<tqlayoutColumn>::Iterator it2; + TQValueList<layoutColumn>::Iterator it2; for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 ) { ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col ); @@ -1128,7 +1128,7 @@ void UndoCellFormat::undo() } else if( util_isRowSelected( range ) ) { - TQValueList<tqlayoutRow>::Iterator it2; + TQValueList<layoutRow>::Iterator it2; for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 ) { RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row ); @@ -1136,7 +1136,7 @@ void UndoCellFormat::undo() } } - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row ); @@ -1167,7 +1167,7 @@ void UndoCellFormat::redo() TQRect range = (*it)->rect().normalize(); if ( util_isColumnSelected( range ) ) { - TQValueList<tqlayoutColumn>::Iterator it2; + TQValueList<layoutColumn>::Iterator it2; for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 ) { ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col ); @@ -1176,7 +1176,7 @@ void UndoCellFormat::redo() } else if( util_isRowSelected( range ) ) { - TQValueList<tqlayoutRow>::Iterator it2; + TQValueList<layoutRow>::Iterator it2; for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 ) { RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row ); @@ -1184,7 +1184,7 @@ void UndoCellFormat::redo() } } - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 ) { Cell * cell = sheet->nonDefaultCell( (*it2).col,(*it2).row ); @@ -1250,10 +1250,10 @@ UndoSort::UndoSort( Doc * _doc, Sheet * _sheet, const TQRect & _selection ) : copyAll( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet ); } -void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayoutColumn> & listCol, - TQValueList<tqlayoutRow> & listRow, Sheet * sheet ) +void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutColumn> & listCol, + TQValueList<layoutRow> & listRow, Sheet * sheet ) { - TQValueList<tqlayoutTextCell>::Iterator it2; + TQValueList<layoutTextCell>::Iterator it2; for ( it2 = list.begin(); it2 != list.end(); ++it2 ) { delete (*it2).l; @@ -1265,7 +1265,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou Cell * c; for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col) { - tqlayoutColumn tmptqlayout; + layoutColumn tmptqlayout; tmptqlayout.col = col; tmptqlayout.l = new ColumnFormat( sheet, col ); tmptqlayout.l->copy( *(sheet->columnFormat( col )) ); @@ -1276,7 +1276,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou { if ( !c->isPartOfMerged() ) { - tqlayoutTextCell tmptqlayout; + layoutTextCell tmptqlayout; tmptqlayout.col = col; tmptqlayout.row = c->row(); tmptqlayout.l = new Format( sheet, 0 ); @@ -1294,7 +1294,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou Cell * c; for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row) { - tqlayoutRow tmptqlayout; + layoutRow tmptqlayout; tmptqlayout.row = row; tmptqlayout.l = new RowFormat( sheet, row ); tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); @@ -1305,7 +1305,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou { if ( !c->isPartOfMerged() ) { - tqlayoutTextCell tmptqlayout; + layoutTextCell tmptqlayout; tmptqlayout.col = c->column(); tmptqlayout.row = row; tmptqlayout.l = new Format( sheet, 0 ); @@ -1328,7 +1328,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou cell = sheet->nonDefaultCell( x, y ); if (!cell->isPartOfMerged()) { - tqlayoutTextCell tmptqlayout; + layoutTextCell tmptqlayout; tmptqlayout.col = x; tmptqlayout.row = y; tmptqlayout.l = new Format( sheet, 0 ); @@ -1342,7 +1342,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou UndoSort::~UndoSort() { - TQValueList<tqlayoutTextCell>::Iterator it2; + TQValueList<layoutTextCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { delete (*it2).l; @@ -1355,7 +1355,7 @@ UndoSort::~UndoSort() } m_lstRedoFormats.clear(); - TQValueList<tqlayoutColumn>::Iterator it3; + TQValueList<layoutColumn>::Iterator it3; for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 ) { delete (*it3).l; @@ -1368,7 +1368,7 @@ UndoSort::~UndoSort() } m_lstRedoColFormats.clear(); - TQValueList<tqlayoutRow>::Iterator it4; + TQValueList<layoutRow>::Iterator it4; for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 ) { delete (*it4).l; @@ -1397,7 +1397,7 @@ void UndoSort::undo() if ( util_isColumnSelected( m_rctRect ) ) { - TQValueList<tqlayoutColumn>::Iterator it2; + TQValueList<layoutColumn>::Iterator it2; for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 ) { ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col ); @@ -1406,7 +1406,7 @@ void UndoSort::undo() } else if( util_isRowSelected( m_rctRect ) ) { - TQValueList<tqlayoutRow>::Iterator it2; + TQValueList<layoutRow>::Iterator it2; for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 ) { RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row ); @@ -1414,7 +1414,7 @@ void UndoSort::undo() } } - TQValueList<tqlayoutTextCell>::Iterator it2; + TQValueList<layoutTextCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row ); @@ -1449,7 +1449,7 @@ void UndoSort::redo() if( util_isColumnSelected( m_rctRect ) ) { - TQValueList<tqlayoutColumn>::Iterator it2; + TQValueList<layoutColumn>::Iterator it2; for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 ) { ColumnFormat *col= sheet->nonDefaultColumnFormat( (*it2).col ); @@ -1458,7 +1458,7 @@ void UndoSort::redo() } else if( util_isRowSelected( m_rctRect ) ) { - TQValueList<tqlayoutRow>::Iterator it2; + TQValueList<layoutRow>::Iterator it2; for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 ) { RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row ); @@ -1466,7 +1466,7 @@ void UndoSort::redo() } } - TQValueList<tqlayoutTextCell>::Iterator it2; + TQValueList<layoutTextCell>::Iterator it2; for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 ) { Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row ); diff --git a/kspread/kspread_undo.h b/kspread/kspread_undo.h index bb68a43f..f4e90826 100644 --- a/kspread/kspread_undo.h +++ b/kspread/kspread_undo.h @@ -60,25 +60,25 @@ int col; TQString text; }; -struct tqlayoutTextCell { +struct layoutTextCell { int row; int col; Format * l; TQString text; }; -struct tqlayoutCell { +struct layoutCell { int row; int col; Format *l; }; -struct tqlayoutColumn { +struct layoutColumn { int col; ColumnFormat *l; }; -struct tqlayoutRow { +struct layoutRow { int row; RowFormat *l; }; @@ -362,15 +362,15 @@ public: virtual void redo(); protected: - void copyFormat( TQValueList<tqlayoutCell> &list,TQValueList<tqlayoutColumn> &listCol,TQValueList<tqlayoutRow> &listRow, Sheet* sheet ); + void copyFormat( TQValueList<layoutCell> &list,TQValueList<layoutColumn> &listCol,TQValueList<layoutRow> &listRow, Sheet* sheet ); Region m_region; - TQValueList<tqlayoutCell> m_lstFormats; - TQValueList<tqlayoutCell> m_lstRedoFormats; - TQValueList<tqlayoutColumn> m_lstColFormats; - TQValueList<tqlayoutColumn> m_lstRedoColFormats; - TQValueList<tqlayoutRow> m_lstRowFormats; - TQValueList<tqlayoutRow> m_lstRedoRowFormats; + TQValueList<layoutCell> m_lstFormats; + TQValueList<layoutCell> m_lstRedoFormats; + TQValueList<layoutColumn> m_lstColFormats; + TQValueList<layoutColumn> m_lstRedoColFormats; + TQValueList<layoutRow> m_lstRowFormats; + TQValueList<layoutRow> m_lstRedoRowFormats; TQString m_sheetName; }; @@ -483,16 +483,16 @@ public: virtual void redo(); protected: - void copyAll( TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayoutColumn> & listCol, - TQValueList<tqlayoutRow> & listRow, Sheet * sheet ); + void copyAll( TQValueList<layoutTextCell> & list, TQValueList<layoutColumn> & listCol, + TQValueList<layoutRow> & listRow, Sheet * sheet ); TQRect m_rctRect; - TQValueList<tqlayoutTextCell> m_lstFormats; - TQValueList<tqlayoutTextCell> m_lstRedoFormats; - TQValueList<tqlayoutColumn> m_lstColFormats; - TQValueList<tqlayoutColumn> m_lstRedoColFormats; - TQValueList<tqlayoutRow> m_lstRowFormats; - TQValueList<tqlayoutRow> m_lstRedoRowFormats; + TQValueList<layoutTextCell> m_lstFormats; + TQValueList<layoutTextCell> m_lstRedoFormats; + TQValueList<layoutColumn> m_lstColFormats; + TQValueList<layoutColumn> m_lstRedoColFormats; + TQValueList<layoutRow> m_lstRowFormats; + TQValueList<layoutRow> m_lstRedoRowFormats; TQString m_sheetName; }; diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index b667214f..3244a11d 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -468,7 +468,7 @@ void View::Private::initActions() // -- cell formatting actions -- actions->cellLayout = new KAction( i18n("Cell Format..."), "cell_layout", - TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( tqlayoutDlg() ), ac, "cellLayout" ); + TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); actions->actionExtraProperties = new KAction( i18n( "&Properties" ), "penbrush", 0, @@ -1975,7 +1975,7 @@ void View::initView() TQWidget::setFocusPolicy( TQ_StrongFocus ); setFocusProxy( d->canvas ); - connect( this, TQT_SIGNAL( tqinvalidated() ), d->canvas, TQT_SLOT( update() ) ); + connect( this, TQT_SIGNAL( invalidated() ), d->canvas, TQT_SLOT( update() ) ); TQWidget* bottomPart = new TQWidget( this ); d->tabScrollBarLayout = new TQHBoxLayout( bottomPart ); @@ -3580,7 +3580,7 @@ void View::borderRight() if ( d->activeSheet != 0L ) { doc()->emitBeginOperation( false ); - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) d->activeSheet->borderLeft( d->selection, d->actions->borderColor->color() ); else d->activeSheet->borderRight( d->selection, d->actions->borderColor->color() ); @@ -3595,7 +3595,7 @@ void View::setSelectionRightBorderColor( const TQColor & color ) if ( d->activeSheet != 0L ) { doc()->emitBeginOperation( false ); - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) d->activeSheet->borderLeft( selectionInfo(), color ); else d->activeSheet->borderRight( selectionInfo(), color ); @@ -3610,7 +3610,7 @@ void View::borderLeft() if ( d->activeSheet != 0L ) { doc()->emitBeginOperation( false ); - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) d->activeSheet->borderRight( d->selection, d->actions->borderColor->color() ); else d->activeSheet->borderLeft( d->selection, d->actions->borderColor->color() ); @@ -3625,7 +3625,7 @@ void View::setSelectionLeftBorderColor( const TQColor & color ) if ( d->activeSheet != 0L ) { doc()->emitBeginOperation( false ); - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) d->activeSheet->borderRight( selectionInfo(), color ); else d->activeSheet->borderLeft( selectionInfo(), color ); @@ -3825,7 +3825,7 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet ) return; } - if ( oldSheet && oldSheet->tqlayoutDirection()==Sheet::RightToLeft != d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( oldSheet && oldSheet->layoutDirection()==Sheet::RightToLeft != d->activeSheet->layoutDirection()==Sheet::RightToLeft ) refreshView(); doc()->setDisplaySheet( d->activeSheet ); @@ -3945,7 +3945,7 @@ void View::sheetProperties() bool directionChanged = false; SheetPropertiesDialog* dlg = new SheetPropertiesDialog( this ); - dlg->setLayoutDirection( d->activeSheet->tqlayoutDirection() ); + dlg->setLayoutDirection( d->activeSheet->layoutDirection() ); dlg->setAutoCalc( d->activeSheet->getAutoCalc() ); dlg->setShowGrid( d->activeSheet->getShowGrid() ); dlg->setShowPageBorders( d->activeSheet->isShowPageBorders() ); @@ -3961,10 +3961,10 @@ void View::sheetProperties() { SheetPropertiesCommand* command = new SheetPropertiesCommand( doc(), d->activeSheet ); - if ( d->activeSheet->tqlayoutDirection() != dlg->tqlayoutDirection() ) + if ( d->activeSheet->layoutDirection() != dlg->layoutDirection() ) directionChanged = true; - command->setLayoutDirection( dlg->tqlayoutDirection() ); + command->setLayoutDirection( dlg->layoutDirection() ); command->setAutoCalc( dlg->autoCalc() ); command->setShowGrid( dlg->showGrid() ); command->setShowPageBorders( dlg->showPageBorders() ); @@ -5568,7 +5568,7 @@ void View::refreshView() d->hBorderWidget->setMinimumHeight( doc()->zoomItY( KoGlobal::defaultFont().pointSizeFloat() + 5 ) ); d->vBorderWidget->setMinimumWidth( doc()->zoomItX( YBORDER_WIDTH ) ); - Sheet::LayoutDirection sheetDir = sheet->tqlayoutDirection(); + Sheet::LayoutDirection sheetDir = sheet->layoutDirection(); bool interfaceIsRTL = TQApplication::reverseLayout(); kdDebug()<<" sheetDir == Sheet::LeftToRight :"<<( sheetDir == Sheet::LeftToRight )<<endl; @@ -5886,7 +5886,7 @@ void View::slotListChoosePopupMenu( ) h = cell->extraHeight(); ty += h; - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) { tx = canvasWidget()->width() - tx; } @@ -5894,7 +5894,7 @@ void View::slotListChoosePopupMenu( ) TQPoint p( (int)tx, (int)ty ); TQPoint p2 = d->canvas->mapToGlobal( p ); - if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft ) + if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) { p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 ); } @@ -6353,7 +6353,7 @@ void View::equalizeColumn() } -void View::tqlayoutDlg() +void View::layoutDlg() { if (!activeSheet()) return; diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index f82912b3..4a64a52e 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -465,7 +465,7 @@ public slots: void changeBackgroundColor(); void sortInc(); void sortDec(); - void tqlayoutDlg(); + void layoutDlg(); void extraProperties(); void borderBottom(); void borderRight(); diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index 31a33a0f..5d501798 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -250,7 +250,7 @@ FormatManipulator::FormatManipulator() FormatManipulator::~FormatManipulator() { - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { delete (*it2).l; @@ -263,7 +263,7 @@ FormatManipulator::~FormatManipulator() } m_lstRedoFormats.clear(); - TQValueList<tqlayoutColumn>::Iterator it3; + TQValueList<layoutColumn>::Iterator it3; for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 ) { delete (*it3).l; @@ -276,7 +276,7 @@ FormatManipulator::~FormatManipulator() } m_lstRedoColFormats.clear(); - TQValueList<tqlayoutRow>::Iterator it4; + TQValueList<layoutRow>::Iterator it4; for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 ) { delete (*it4).l; @@ -391,7 +391,7 @@ bool FormatManipulator::process (Element *element) { // undoing if( element->isColumn() ) { - TQValueList<tqlayoutColumn>::Iterator it2; + TQValueList<layoutColumn>::Iterator it2; for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 ) { ColumnFormat * col = m_sheet->nonDefaultColumnFormat( (*it2).col ); @@ -400,7 +400,7 @@ bool FormatManipulator::process (Element *element) } else if( element->isRow() ) { - TQValueList<tqlayoutRow>::Iterator it2; + TQValueList<layoutRow>::Iterator it2; for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 ) { RowFormat * row = m_sheet->nonDefaultRowFormat( (*it2).row ); @@ -408,7 +408,7 @@ bool FormatManipulator::process (Element *element) } } - TQValueList<tqlayoutCell>::Iterator it2; + TQValueList<layoutCell>::Iterator it2; for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 ) { Cell *cell = m_sheet->nonDefaultCell( (*it2).col,(*it2).row ); @@ -421,12 +421,12 @@ bool FormatManipulator::process (Element *element) return true; } -void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, - TQValueList<tqlayoutColumn> & listCol, - TQValueList<tqlayoutRow> & listRow) +void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, + TQValueList<layoutColumn> & listCol, + TQValueList<layoutRow> & listRow) { - TQValueList<tqlayoutCell>::Iterator end = list.end(); - for (TQValueList<tqlayoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2) + TQValueList<layoutCell>::Iterator end = list.end(); + for (TQValueList<layoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2) { delete (*it2).l; } @@ -445,7 +445,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - tqlayoutColumn tmptqlayout; + layoutColumn tmptqlayout; tmptqlayout.col = i; tmptqlayout.l = new ColumnFormat( m_sheet, i ); tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) ); @@ -454,7 +454,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, */ for ( int col = range.left(); col <= right; ++col ) { - tqlayoutColumn tmptqlayout; + layoutColumn tmptqlayout; tmptqlayout.col = col; tmptqlayout.l = new ColumnFormat( m_sheet, col ); tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) ); @@ -469,7 +469,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, continue; } - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = col; tmptqlayout.row = cell->row(); tmptqlayout.l = new Format( m_sheet, 0 ); @@ -487,7 +487,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, if ( range.left() <= col && right >= col && !cell->isPartOfMerged()) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = cell->column(); tmptqlayout.row = cell->row(); tmptqlayout.l = new Format( m_sheet, 0 ); @@ -501,7 +501,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - tqlayoutRow tmptqlayout; + layoutRow tmptqlayout; tmptqlayout.row = row; tmptqlayout.l = new RowFormat( m_sheet, row ); tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) ); @@ -515,7 +515,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, cell = m_sheet->getNextCellRight( cell->column(), row ); continue; } - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = cell->column(); tmptqlayout.row = row; tmptqlayout.l = new Format( m_sheet, 0 ); @@ -533,7 +533,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, if ( range.top() <= row && bottom >= row && !cell->isPartOfMerged()) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = cell->column(); tmptqlayout.row = cell->row(); tmptqlayout.l = new Format( m_sheet, 0 ); @@ -551,7 +551,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list, Cell * cell = m_sheet->nonDefaultCell( col, row ); if ( !cell->isPartOfMerged() ) { - tqlayoutCell tmptqlayout; + layoutCell tmptqlayout; tmptqlayout.col = col; tmptqlayout.row = row; tmptqlayout.l = new Format( m_sheet, 0 ); diff --git a/kspread/manipulator.h b/kspread/manipulator.h index 9af94032..622362bc 100644 --- a/kspread/manipulator.h +++ b/kspread/manipulator.h @@ -42,18 +42,18 @@ class RowFormat; class Sheet; -// struct tqlayoutCell { +// struct layoutCell { // int row; // int col; // Format *l; // }; // -// struct tqlayoutColumn { +// struct layoutColumn { // int col; // ColumnFormat *l; // }; // -// struct tqlayoutRow { +// struct layoutRow { // int row; // RowFormat *l; // }; @@ -176,9 +176,9 @@ protected: virtual bool preProcessing(); virtual bool process(Element*); - void copyFormat(TQValueList<tqlayoutCell> &list, - TQValueList<tqlayoutColumn> &listCol, - TQValueList<tqlayoutRow> &listRow); + void copyFormat(TQValueList<layoutCell> &list, + TQValueList<layoutColumn> &listCol, + TQValueList<layoutRow> &listRow); bool testCondition(RowFormat*); void doWork(Format*, bool isTop, bool isBottom, bool isLeft, bool isRight); void prepareCell(Cell*); @@ -187,12 +187,12 @@ private: TQ_UINT32 m_properties; // TODO Stefan: find a more elegant way to store the format - TQValueList<tqlayoutCell> m_lstFormats; - TQValueList<tqlayoutCell> m_lstRedoFormats; - TQValueList<tqlayoutColumn> m_lstColFormats; - TQValueList<tqlayoutColumn> m_lstRedoColFormats; - TQValueList<tqlayoutRow> m_lstRowFormats; - TQValueList<tqlayoutRow> m_lstRedoRowFormats; + TQValueList<layoutCell> m_lstFormats; + TQValueList<layoutCell> m_lstRedoFormats; + TQValueList<layoutColumn> m_lstColFormats; + TQValueList<layoutColumn> m_lstRedoColFormats; + TQValueList<layoutRow> m_lstRowFormats; + TQValueList<layoutRow> m_lstRedoRowFormats; // SetSelectionFontWorker // SetSelectionSizeWorker diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index a8cdc22a..dc92e9f5 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -167,7 +167,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *tqparent, const ch // - // First the widgets that are the tqparents of the buttons + // First the widgets that are the parents of the buttons mSmallPage = new TQWidget(this); mLargePage = new TQWidget(this); @@ -569,8 +569,8 @@ void TQtCalculator::updateGeometry() // Button groups (base and angle) // //TQButtonGroup *g; - //g = (TQButtonGroup*)(anglebutton[0]->tqparentWidget()); - //g = (TQButtonGroup*)(basebutton[0]->tqparentWidget()); + //g = (TQButtonGroup*)(anglebutton[0]->parentWidget()); + //g = (TQButtonGroup*)(basebutton[0]->parentWidget()); // // Calculator buttons diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui index b2c82866..712b11b4 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui @@ -199,7 +199,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatewidget.h</includehint> <includehint>kdatewidget.h</includehint> diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index cedc82cc..8217a751 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -22,10 +22,10 @@ except (ImportError): # Samples. class Widget(qt.QHBox): - def __init__(self, tqparentwidget, label = None): - self.tqparentwidget = tqparentwidget + def __init__(self, parentwidget, label = None): + self.parentwidget = parentwidget import qt - qt.QHBox.__init__(self, tqparentwidget) + qt.QHBox.__init__(self, parentwidget) self.setMargin(4) self.setSpacing(4) if label != None: qt.QLabel(label, self) @@ -33,10 +33,10 @@ class Widget(qt.QHBox): return None class ListWidget(Widget): - def __init__(self, tqparentwidget, label): + def __init__(self, parentwidget, label): import qt global Widget - Widget.__init__(self, tqparentwidget, label) + Widget.__init__(self, parentwidget, label) self.combo = qt.QComboBox(self) self.combo.setEditable(True) self.setStretchFactor(self.combo,1) @@ -44,22 +44,22 @@ class ListWidget(Widget): return self.combo.currentText() class EditWidget(Widget): - def __init__(self, tqparentwidget, label): + def __init__(self, parentwidget, label): import qt global Widget - Widget.__init__(self, tqparentwidget, label) + Widget.__init__(self, parentwidget, label) self.edit = qt.QLineEdit(self) self.setStretchFactor(self.edit,1) def value(self): return self.edit.text() class FileWidget(Widget): - def __init__(self, tqparentwidget, label, filtertqmask, openfiledialog = True): + def __init__(self, parentwidget, label, filtertqmask, openfiledialog = True): self.filtertqmask = filtertqmask self.openfiledialog = openfiledialog import qt global Widget - Widget.__init__(self, tqparentwidget, label) + Widget.__init__(self, parentwidget, label) self.edit = qt.QLineEdit(self) self.setStretchFactor(self.edit,1) btn = qt.QPushButton("...",self) @@ -68,9 +68,9 @@ class FileWidget(Widget): import qt text = str( self.edit.text() ) if self.openfiledialog: - filename = str( qt.QFileDialog.getOpenFileName(text, self.filtertqmask, self.tqparentwidget) ) + filename = str( qt.QFileDialog.getOpenFileName(text, self.filtertqmask, self.parentwidget) ) else: - filename = qt.QFileDialog.getSaveFileName(text, self.filtertqmask, self.tqparentwidget) + filename = qt.QFileDialog.getSaveFileName(text, self.filtertqmask, self.parentwidget) if filename != "": self.edit.setText( filename ) def value(self): return self.edit.text() @@ -81,33 +81,33 @@ class Samples: # KexiDB class KexiDB: - def __init__(self, tqparentwidget): - self.tqparentwidget = tqparentwidget + def __init__(self, parentwidget): + self.parentwidget = parentwidget class _ProjectWidget(FileWidget): - def __init__(self, tqparentwidget): + def __init__(self, parentwidget): global FileWidget - FileWidget.__init__(self, tqparentwidget, "Project File:", "*.kexi *.kexis *.kexic;;*") + FileWidget.__init__(self, parentwidget, "Project File:", "*.kexi *.kexis *.kexic;;*") class _DriverWidget(ListWidget): - def __init__(self, tqparentwidget): + def __init__(self, parentwidget): global ListWidget - ListWidget.__init__(self, tqparentwidget, "Driver:") + ListWidget.__init__(self, parentwidget, "Driver:") import krosskexidb for driver in krosskexidb.DriverManager().driverNames(): self.combo.insertItem(driver) class _TableWidget(ListWidget): - def __init__(self, tqparentwidget): + def __init__(self, parentwidget): global ListWidget - ListWidget.__init__(self, tqparentwidget, "Table:") + ListWidget.__init__(self, parentwidget, "Table:") class PrintDriverDetails: """ Print a the list of available KexiDB drivers and print details about one of them. """ name = "Details about a driver" def __init__(self, tqparent): self.widgets = { - "DriverName" : Samples.KexiDB._DriverWidget( tqparent.tqparentwidget ), + "DriverName" : Samples.KexiDB._DriverWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -127,7 +127,7 @@ class Samples: name = "Connect with file" def __init__(self, tqparent): self.widgets = { - "ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.tqparentwidget ), + "ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -166,8 +166,8 @@ class Samples: name = "Iterate through table" def __init__(self, tqparent): self.widgets = { - "ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.tqparentwidget ), - "TableName" : Samples.KexiDB._TableWidget( tqparent.tqparentwidget ), + "ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ), + "TableName" : Samples.KexiDB._TableWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -216,13 +216,13 @@ class Samples: # KSpread class KSpread: - def __init__(self, tqparentwidget): - self.tqparentwidget = tqparentwidget + def __init__(self, parentwidget): + self.parentwidget = parentwidget class _SheetWidget(ListWidget): - def __init__(self, tqparentwidget, label = "Sheet:"): + def __init__(self, parentwidget, label = "Sheet:"): global ListWidget - ListWidget.__init__(self, tqparentwidget, label) + ListWidget.__init__(self, parentwidget, label) try: import krosskspreadcore @@ -235,9 +235,9 @@ class Samples: print trace class _CellsWidget(ListWidget): - def __init__(self, tqparentwidget): + def __init__(self, parentwidget): global ListWidget - ListWidget.__init__(self, tqparentwidget, "Cells (col1:row1 - col2:row2):") + ListWidget.__init__(self, parentwidget, "Cells (col1:row1 - col2:row2):") self.combo.insertItem( "1:1 - %s:%s" % (5,10) ) self.combo.insertItem( "1:1 - %s:%s" % (256,256) ) self.combo.insertItem( "1:1 - %s:%s" % (32767,32767) ) @@ -245,15 +245,15 @@ class Samples: return [ [ int(i) for i in item.split(':') ] for item in str( ListWidget.value(self) ).split('-') ] class _ValueWidget(EditWidget): - def __init__(self, tqparentwidget): + def __init__(self, parentwidget): global EditWidget - EditWidget.__init__(self, tqparentwidget, "Value:") + EditWidget.__init__(self, parentwidget, "Value:") self.edit.setText("Some text") class _ColorWidget(EditWidget): - def __init__(self, tqparentwidget,label,color): + def __init__(self, parentwidget,label,color): global EditWidget - EditWidget.__init__(self, tqparentwidget, "%s (RGB):" % label) + EditWidget.__init__(self, parentwidget, "%s (RGB):" % label) self.edit.setText(color) def value(self): return "#%s" % EditWidget.value(self) @@ -264,9 +264,9 @@ class Samples: def __init__(self, tqparent): pass self.widgets = { - "SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ), - "Cells" : Samples.KSpread._CellsWidget( tqparent.tqparentwidget ), - "Value" : Samples.KSpread._ValueWidget( tqparent.tqparentwidget ), + "SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ), + "Cells" : Samples.KSpread._CellsWidget( tqparent.parentwidget ), + "Value" : Samples.KSpread._ValueWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -295,10 +295,10 @@ class Samples: def __init__(self, tqparent): pass self.widgets = { - "SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget), - "Cells" : Samples.KSpread._CellsWidget( tqparent.tqparentwidget ), - "TextColor" : Samples.KSpread._ColorWidget( tqparent.tqparentwidget, "Textcolor", "ff0000" ), - "BackgroundColor" : Samples.KSpread._ColorWidget( tqparent.tqparentwidget, "Backgroundcolor", "c0c0c0" ), + "SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget), + "Cells" : Samples.KSpread._CellsWidget( tqparent.parentwidget ), + "TextColor" : Samples.KSpread._ColorWidget( tqparent.parentwidget, "Textcolor", "ff0000" ), + "BackgroundColor" : Samples.KSpread._ColorWidget( tqparent.parentwidget, "Backgroundcolor", "c0c0c0" ), } def getCode(self): return ( @@ -327,7 +327,7 @@ class Samples: def __init__(self, tqparent): pass self.widgets = { - "SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ), + "SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -354,7 +354,7 @@ class Samples: name = "Details about a sheet" def __init__(self, tqparent): self.widgets = { - "SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ), + "SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ), } def getCode(self): return ( @@ -379,7 +379,7 @@ class Samples: def __init__(self, tqparent): global FileWidget self.widgets = { - "FileName" : FileWidget( tqparent.tqparentwidget, "XML File:", "*.xml;;*" ), + "FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*" ), } def getCode(self): return ( @@ -416,7 +416,7 @@ class Samples: def __init__(self, tqparent): global FileWidget self.widgets = { - "FileName" : FileWidget( tqparent.tqparentwidget, "XML File:", "*.xml;;*", False ), + "FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*", False ), } def getCode(self): return ( @@ -453,8 +453,8 @@ class Samples: name = "Copy sheets" def __init__(self, tqparent): self.widgets = { - "SourceSheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget, "Source sheet:" ), - "TargetSheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget, "Target sheet:" ), + "SourceSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Source sheet:" ), + "TargetSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Target sheet:" ), } def getCode(self): return ( @@ -482,8 +482,8 @@ class Samples: name = "Load data from CSV file into sheet" def __init__(self, tqparent): self.widgets = { - "Sheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ), - "FileName" : FileWidget( tqparent.tqparentwidget, "CSV File:", "*.csv;;*", True ), + "Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ), + "FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", True ), } def getCode(self): return ( @@ -521,8 +521,8 @@ class Samples: name = "Save data from a sheet into a CSV file" def __init__(self, tqparent): self.widgets = { - "Sheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ), - "FileName" : FileWidget( tqparent.tqparentwidget, "CSV File:", "*.csv;;*", False ), + "Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ), + "FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", False ), } def getCode(self): return ( @@ -557,8 +557,8 @@ class Samples: # PyQt class PyQt: - def __init__(self, tqparentwidget): - self.tqparentwidget = tqparentwidget + def __init__(self, parentwidget): + self.parentwidget = parentwidget class OpenFileDialog: """ Show the usage of the openfile dialog with QFileDialog. """ @@ -566,7 +566,7 @@ class Samples: def __init__(self, tqparent): pass self.widgets = { - "FileName" : FileWidget( tqparent.tqparentwidget, "Open File:", "*.txt *.html;;*" ), + "FileName" : FileWidget( tqparent.parentwidget, "Open File:", "*.txt *.html;;*" ), } def getCode(self): return ( @@ -581,7 +581,7 @@ class Samples: def __init__(self, tqparent): pass self.widgets = { - "FileName" : FileWidget( tqparent.tqparentwidget, "Save File:", "*.txt *.html;;*", False ), + "FileName" : FileWidget( tqparent.parentwidget, "Save File:", "*.txt *.html;;*", False ), } def getCode(self): return ( @@ -622,8 +622,8 @@ class Samples: def __init__(self, tqparent): global EditWidget self.widgets = { - "Caption" : EditWidget( tqparent.tqparentwidget, "Caption" ), - "Message" : EditWidget( tqparent.tqparentwidget, "Message" ), + "Caption" : EditWidget( tqparent.parentwidget, "Caption" ), + "Message" : EditWidget( tqparent.parentwidget, "Message" ), } def getCode(self): return ( @@ -640,8 +640,8 @@ class Samples: # DCOP class DCOP: - def __init__(self, tqparentwidget): - self.tqparentwidget = tqparentwidget + def __init__(self, parentwidget): + self.parentwidget = parentwidget class PrintClipboard: """ Print the content from the clipper via DCOP. """ diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cc index b7f9f227..19a70d61 100644 --- a/kspread/tests/formula_tester.cc +++ b/kspread/tests/formula_tester.cc @@ -252,7 +252,7 @@ void FormulaEvalTester::run() CHECK_EVAL( "1.2--COS(0)", Value(2.2) ); CHECK_EVAL( "1.3---COS(0)", Value(0.3) ); - // no tqparentheses, checking operator precendences + // no parentheses, checking operator precendences CHECK_EVAL( "14+3*77", Value(245) ); CHECK_EVAL( "14-3*77", Value(-217) ); CHECK_EVAL( "26*4+81", Value(185) ); diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc index ad186817..72410f53 100644 --- a/kspread/tests/inspector.cc +++ b/kspread/tests/inspector.cc @@ -169,7 +169,7 @@ void Inspector::Private::handleSheet() sheetView->clear(); new TQListViewItem( sheetView, "Name", sheet->sheetName() ) ; - new TQListViewItem( sheetView, "Layout Direction", dirAsString( sheet->tqlayoutDirection() ) ); + new TQListViewItem( sheetView, "Layout Direction", dirAsString( sheet->layoutDirection() ) ); } void Inspector::Private::handleDep() |