diff options
Diffstat (limited to 'kspread')
-rw-r--r-- | kspread/dialogs/kspread_dlg_series.cc | 8 | ||||
-rw-r--r-- | kspread/kspread_cell.cc | 12 | ||||
-rw-r--r-- | kspread/kspread_view.cc | 6 | ||||
-rw-r--r-- | kspread/manipulator.cc | 4 | ||||
-rw-r--r-- | kspread/manipulator.h | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc index 9c003498..ee241617 100644 --- a/kspread/dialogs/kspread_dlg_series.cc +++ b/kspread/dialogs/kspread_dlg_series.cc @@ -6,7 +6,7 @@ (C) 2001-2002 Philipp Mueller <[email protected]> (C) 2000-2001 Werner Trobin <[email protected]> (C) 1998-2000 Torben Weis <[email protected]> - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either @@ -95,7 +95,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) new TQLabel( i18n( "Step value:" ), params ); step=new KDoubleNumInput(-999999.999, 999999.99, 0.0, 1.0, 3, params); - + grid1->addWidget(gb); grid1->addWidget(gb1); @@ -110,8 +110,8 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) void SeriesDlg::slotOk() { - Series mode=Column; //same asQt::Vertical - Series type=Linear; // same asQt::Horizontal + Series mode=Column; //same as Qt::Vertical + Series type=Linear; // same as Qt::Horizontal TQString tmp; double dstep, dend, dstart; Sheet * m_pSheet; diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index 991f6433..fca76bbe 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -1871,7 +1871,7 @@ void Cell::offsetAlign( int _col, int _row ) void Cell::textSize( TQPainter &_paint ) { TQFontMetrics fm = _paint.fontMetrics(); - //Qt::Horizontal text ? + // Horizontal text ? int tmpAngle; int _row = row(); @@ -1919,7 +1919,7 @@ void Cell::textSize( TQPainter &_paint ) // Set d->textWidth and d->textHeight to correct values according to // if the text is horizontal, vertical or rotated. if ( !tmpVerticalText && !tmpAngle ) { - //Qt::Horizontal text. + // Horizontal text. d->textWidth = format()->sheet()->doc()->unzoomItX( fm.width( d->strOutText ) ); int offsetFont = 0; @@ -1946,7 +1946,7 @@ void Cell::textSize( TQPainter &_paint ) * cos ( tmpAngle * M_PI / 180 ) ) ); } else { - //Qt::Vertical text. + // Vertical text. int width = 0; for ( unsigned int i = 0; i < d->strOutText.length(); i++ ) width = TQMAX( width, fm.width( d->strOutText.at( i ) ) ); @@ -3348,7 +3348,7 @@ void Cell::paintText( TQPainter& painter, // - One line of text , horizontal // - Angled text // - Multiple rows of text , horizontal - // -Qt::Vertical text + // - Vertical text if ( !tmpMultiRow && !tmpVerticalText && !tmpAngle ) { // Case 1: The simple case, one line, no angle. @@ -3424,7 +3424,7 @@ void Cell::paintText( TQPainter& painter, } while ( i != -1 ); } else if ( tmpVerticalText && !d->strOutText.isEmpty() ) { - // Case 4:Qt::Vertical text. + // Case 4: Vertical text. TQString t; int i = 0; @@ -4139,7 +4139,7 @@ TQString Cell::textDisplaying( TQPainter &_painter ) return TQString( "" ); } else if ( format()->verticalText( column(), row() ) ) { - //Qt::Vertical text. + // Vertical text. RowFormat *rl = format()->sheet()->rowFormat( row() ); double tmpIndent = 0.0; diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index cfcb3f86..0fe4f80d 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -693,12 +693,12 @@ void View::Private::initActions() actions->mergeCell->setToolTip(i18n("Merge the selected region.")); actions->mergeCell->plug( actions->mergeCell->popupMenu() ); - actions->mergeCellHorizontal = new TDEAction( i18n("Merge CellsQt::Horizontally"),"mergecell-horizontal", + actions->mergeCellHorizontal = new TDEAction( i18n("Merge Cells Horizontally"),"mergecell-horizontal", 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally.")); actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() ); - actions->mergeCellVertical = new TDEAction( i18n("Merge CellsQt::Vertically"),"mergecell-vertical", + actions->mergeCellVertical = new TDEAction( i18n("Merge Cells Vertically"),"mergecell-vertical", 0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically.")); actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() ); @@ -2150,7 +2150,7 @@ if ( config->hasGroup("KSpread Page Layout" ) ) { d->activeSheet->setPaperFormat((KoFormat)config->readNumEntry("Default size page",1)); - d->activeSheet->setPaperQt::Orientation((KoOrientation)config->readNumEntry("Default orientation page",0)); + d->activeSheet->setPaperOrientation((KoOrientation)config->readNumEntry("Default orientation page",0)); d->activeSheet->setPaperUnit((KoUnit::Unit)config->readNumEntry("Default unit page",0)); } } diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index b095191c..b8b603c8 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -903,11 +903,11 @@ TQString MergeManipulator::name() const { if (m_mergeHorizontal) { - return i18n("Merge CellsQt::Horizontally"); + return i18n("Merge Cells Horizontally"); } else if (m_mergeVertical) { - return i18n("Merge CellsQt::Vertically"); + return i18n("Merge Cells Vertically"); } else { diff --git a/kspread/manipulator.h b/kspread/manipulator.h index d7c03959..ede66863 100644 --- a/kspread/manipulator.h +++ b/kspread/manipulator.h @@ -47,12 +47,12 @@ class Sheet; // int col; // Format *l; // }; -// +// // struct layoutColumn { // int col; // ColumnFormat *l; // }; -// +// // struct layoutRow { // int row; // RowFormat *l; @@ -388,7 +388,7 @@ class HorAlignManipulator : public FormatManipulator ~HorAlignManipulator() {} protected: - virtual TQString name() const { return i18n("ChangeQt::Horizontal Alignment"); } + virtual TQString name() const { return i18n("Change Horizontal Alignment"); } private: }; @@ -405,7 +405,7 @@ class VerAlignManipulator : public FormatManipulator ~VerAlignManipulator() {} protected: - virtual TQString name() const { return i18n("ChangeQt::Vertical Alignment"); } + virtual TQString name() const { return i18n("Change Vertical Alignment"); } private: }; |