Rename obsolete tq methods to standard names

1 files changed, 19 insertions, 19 deletions

diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index a888a392..8d6cf77b 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -3940,7 +3940,7 @@ void Sheet::swapCells( int x1, int y1, int x2, int y2, bool cpFormat )
     }
 
   // Dummy cell used for swapping cells.
-  // In fact we copy only content and no tqlayout
+  // In fact we copy only content and no layout
   // information. Imagine sorting in a sheet. Swapping
   // the format while sorting is not what you would expect
   // as a user.
@@ -5088,7 +5088,7 @@ void Sheet::copySelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::tqclipboard()->setData( kd );
+    TQApplication::clipboard()->setData( kd );
 }
 
 void Sheet::cutSelection( Selection* selectionInfo )
@@ -5107,7 +5107,7 @@ void Sheet::cutSelection( Selection* selectionInfo )
     kd->setPlain( copyAsText(selectionInfo) );
     kd->setKSpread( buffer.buffer() );
 
-    TQApplication::tqclipboard()->setData( kd );
+    TQApplication::clipboard()->setData( kd );
 
     deleteSelection( selectionInfo, true );
 }
@@ -5117,7 +5117,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
                    bool insert, int insertTo, bool pasteFC,
                    TQClipboard::Mode clipboardMode )
 {
-    TQMimeSource * mime = TQApplication::tqclipboard()->data( clipboardMode );
+    TQMimeSource * mime = TQApplication::clipboard()->data( clipboardMode );
     if ( !mime )
         return;
 
@@ -5131,7 +5131,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo,
     {
         // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-)
-        TQString _text = TQApplication::tqclipboard()->text( clipboardMode );
+        TQString _text = TQApplication::clipboard()->text( clipboardMode );
         doc()->emitBeginOperation();
         pasteTextPlain( _text, pasteArea );
         emit sig_updateView( this );
@@ -5523,7 +5523,7 @@ void Sheet::loadSelectionUndo(const TQDomDocument& d, const TQRect& loadArea,
 
 bool Sheet::testAreaPasteInsert()const
 {
-    TQMimeSource* mime = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
+    TQMimeSource* mime = TQApplication::clipboard()->data( TQClipboard::Clipboard );
     if ( !mime )
         return false;
 
@@ -6418,16 +6418,16 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext&
                 if ( masterStyle )
                 {
                     loadSheetStyleFormat( masterStyle );
-                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-tqlayout-name" ) )
+                    if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-layout-name" ) )
                     {
-                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() );
+                        TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-layout-name", TQString() );
                         //kdDebug()<<"masterPageLayoutStyleName :"<<masterPageLayoutStyleName<<endl;
                         const TQDomElement *masterLayoutStyle = oasisContext.oasisStyles().findStyle( masterPageLayoutStyleName );
                       if ( masterLayoutStyle )
                       {
                         //kdDebug()<<"masterLayoutStyle :"<<masterLayoutStyle<<endl;
                         KoStyleStack styleStack;
-                        styleStack.setTypeProperties( "page-tqlayout" );
+                        styleStack.setTypeProperties( "page-layout" );
                         styleStack.push( *masterLayoutStyle );
                         loadOasisMasterLayoutPage( styleStack );
                       }
@@ -6564,7 +6564,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
     TQString orientation = "Portrait";
     TQString format;
 
-    // Laurent : Why we stored tqlayout information as Millimeter ?!!!!!
+    // Laurent : Why we stored layout information as Millimeter ?!!!!!
     // kspread used point for all other attribute
     // I don't understand :(
     if ( styleStack.hasAttributeNS( KoXmlNS::fo, "page-width" ) )
@@ -6717,7 +6717,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         kdDebug() << "Repeated: " << number << endl;
     }
 
-    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
+    Format layout( this , doc()->styleManager()->defaultStyle() );
     if ( column.hasAttributeNS( KoXmlNS::table, "default-cell-style-name" ) )
     {
       const TQString styleName = column.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6726,7 +6726,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          tqlayout.setStyle( style );
+          layout.setStyle( style );
           isNonDefaultColumn = true;
         }
       }
@@ -6799,7 +6799,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa
       {
         columnFormat = this->columnFormat( indexCol );
       }
-      columnFormat->copy( tqlayout );
+      columnFormat->copy( layout );
 
       ++indexCol;
     }
@@ -6828,7 +6828,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
     }
     styleStack.setTypeProperties( "table-row" );
 
-    Format tqlayout( this , doc()->styleManager()->defaultStyle() );
+    Format layout( this , doc()->styleManager()->defaultStyle() );
     if ( row.hasAttributeNS( KoXmlNS::table,"default-cell-style-name" ) )
     {
       const TQString styleName = row.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() );
@@ -6837,7 +6837,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
         Style* const style = styleMap[ styleName ];
         if ( style )
         {
-          tqlayout.setStyle( style );
+          layout.setStyle( style );
           isNonDefaultRow = true;
         }
       }
@@ -6908,7 +6908,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin
       {
         rowFormat = this->rowFormat( rowIndex );
       }
-      rowFormat->copy( tqlayout );
+      rowFormat->copy( layout );
 
       ++rowIndex;
     }
@@ -7355,7 +7355,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles )
     KoGenStyle pageStyle( Doc::STYLE_PAGE, "table"/*FIXME I don't know if name is sheet*/ );
 
     KoGenStyle pageMaster( Doc::STYLE_PAGEMASTER );
-    pageMaster.addAttribute( "style:page-tqlayout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
+    pageMaster.addAttribute( "style:page-layout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) );
 
     TQBuffer buffer;
     buffer.open( IO_WriteOnly );
@@ -7391,7 +7391,7 @@ void Sheet::saveOasisColRowCell( KoXmlWriter& xmlWriter, KoGenStyles &mainStyles
         currentColumnStyle.addPropertyPt( "style:column-width", column->dblWidth() );
         currentColumnStyle.addProperty( "fo:break-before", "auto" );/*FIXME auto or not ?*/
 
-        //style default tqlayout for column
+        //style default layout for column
         KoGenStyle currentDefaultCellStyle; // the type is determined in saveOasisCellStyle
         TQString currentDefaultCellStyleName = column->saveOasisCellStyle( currentDefaultCellStyle, mainStyles );
 
@@ -7774,7 +7774,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
         // we just ignore 'ok' - if it didn't work, go on
     }
 
-    // Load the paper tqlayout
+    // Load the paper layout
     TQDomElement paper = sheet.namedItem( "paper" ).toElement();
     if ( !paper.isNull() )
     {