Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 38 insertions, 38 deletions

diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 67b326e5..cb947f34 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -35,9 +35,9 @@
 
 // TQt includes
 #include <tqbuffer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
@@ -237,7 +237,7 @@ public:
 
     TQPopupMenu *popupRow;
     TQPopupMenu *popupColumn;
-    TQPopupMenu* popupChild;       // for embedded children
+    TQPopupMenu* popupChild;       // for embedded tqchildren
     TQPopupMenu* popupListChoose;  // for list of choose
 
     // the child for which the popup menu has been opened.
@@ -911,7 +911,7 @@ void View::Private::initActions()
 
   actions->paperLayout = new KAction( i18n("Page Layout..."),
       0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" );
-  actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout."));
+  actions->paperLayout->setToolTip(i18n("Specify the tqlayout of the spreadsheet for a printout."));
 
   actions->definePrintRange = new KAction( i18n("Define Print Range"),
       0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" );
@@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/)
 
 TQString KPSheetSelectPage::printOptionForIndex(unsigned int index)
 {
-  return TQString("sheetprintorder%1").arg(index);
+  return TQString("sheetprintorder%1").tqarg(index);
 }
 
 void KPSheetSelectPage::prependAvailableSheet(const TQString& sheetname)
@@ -1880,7 +1880,7 @@ View::~View()
     // of embedded child documents possible repaints in Sheet are not
     // performed. The repains can happen if you delete an embedded document,
     // which leads to an regionInvalidated() signal emission in KoView, which calls
-    // repaint, etc.etc. :-) (Simon)
+    // tqrepaint, etc.etc. :-) (Simon)
 
     delete d->selection;
     delete d->choice;
@@ -1968,8 +1968,8 @@ void View::initView()
 
     d->hBorderWidget = new HBorder( this, d->canvas,this );
     d->vBorderWidget = new VBorder( this, d->canvas ,this );
-    d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+    d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     d->canvas->setFocusPolicy( TQ_StrongFocus );
     TQWidget::setFocusPolicy( TQ_StrongFocus );
@@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet )
   if ( updateSheet )
   {
     d->tabBar->setActiveTab( _t->sheetName() );
-    d->vBorderWidget->repaint();
-    d->hBorderWidget->repaint();
+    d->vBorderWidget->tqrepaint();
+    d->hBorderWidget->tqrepaint();
     d->activeSheet->setRegionPaintDirty(TQRect(TQPoint(0,0), TQPoint(KS_colMax, KS_rowMax)));
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
@@ -3914,8 +3914,8 @@ void View::changeSheet( const TQString& _name )
     updateBorderButton();
 
     //update visible area
-    d->vBorderWidget->repaint();
-    d->hBorderWidget->repaint();
+    d->vBorderWidget->tqrepaint();
+    d->hBorderWidget->tqrepaint();
     d->canvas->slotMaxColumn( d->activeSheet->maxColumn() );
     d->canvas->slotMaxRow( d->activeSheet->maxRow() );
     t->setRegionPaintDirty( t->visibleRect( d->canvas ) );
@@ -4135,7 +4135,7 @@ void View::paste()
   if (!koDocument()->isReadWrite()) // don't paste into a read only document
     return;
 
-  TQMimeSource *data = TQApplication::clipboard()->data( TQClipboard::Clipboard );
+  TQMimeSource *data = TQApplication::tqclipboard()->data( TQClipboard::Clipboard );
   for ( int i=0; data->format(i) != 0; i++ )
     kdDebug() << "format:" << data->format(i) << endl;
 
@@ -4143,7 +4143,7 @@ void View::paste()
   {
     canvasWidget()->deselectAllObjects();
     TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet";
-    const TQByteArray arr = data->encodedData( returnedTypeMime );
+    const TQByteArray arr = data->tqencodedData( returnedTypeMime );
     if( arr.isEmpty() )
       return;
     TQBuffer buffer( arr );
@@ -4206,7 +4206,7 @@ void View::paste()
   else
   {
     //TODO:  What if the clipboard data is available in both pixmap and OASIS format? (ie. for embedded parts)
-    TQPixmap clipboardPixmap = TQApplication::clipboard()->pixmap( TQClipboard::Clipboard );
+    TQPixmap clipboardPixmap = TQApplication::tqclipboard()->pixmap( TQClipboard::Clipboard );
     if (!clipboardPixmap.isNull())
     {
         d->activeSheet->insertPicture( markerDocumentPosition()  , clipboardPixmap );
@@ -4914,7 +4914,7 @@ void View::setupPrinter( KPrinter &prt )
 
     SheetPrint* print = d->activeSheet->print();
 
-    //apply page layout parameters
+    //apply page tqlayout parameters
     KoFormat pageFormat = print->paperFormat();
 
     prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) );
@@ -4971,7 +4971,7 @@ void View::print( KPrinter &prt )
         Sheet* sheet = doc()->map()->findSheet(*sheetlistiterator);
         if (sheet == NULL)
         {
-          kdWarning() << i18n("Sheet %1 could not be found for printing").arg(*sheetlistiterator) << endl;
+          kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*sheetlistiterator) << endl;
           continue;
         }
 
@@ -5038,7 +5038,7 @@ void View::print( KPrinter &prt )
             if( !prt.previewOnly() )
             {
                 KMessageBox::information( 0,
-                i18n("Nothing to print for sheet %1.").arg(
+                i18n("Nothing to print for sheet %1.").tqarg(
                 d->activeSheet->sheetName()) );
                 //@todo: make sure we really can comment this out,
                 //       what to do with partially broken printouts?
@@ -5051,13 +5051,13 @@ void View::print( KPrinter &prt )
     this->setActiveSheet(selectedsheet);
 }
 
-void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e )
+void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e )
 {
     if ( !d->activeSheet )
       return;
 
     // Transform the view coordinates to document coordinates
-    KoRect unzoomedRect = doc()->unzoomRect( _geometry );
+    KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
     unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
     InsertObjectCommand *cmd = 0;
@@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e )
     cmd->execute();
 }
 
-void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e )
+void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e )
 {
   if ( !d->activeSheet )
     return;
 
   // Transform the view coordinates to document coordinates
-  KoRect unzoomedRect = doc()->unzoomRect( _geometry );
+  KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry );
   unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() );
 
   InsertObjectCommand *cmd = new InsertObjectCommand( unzoomedRect, _e, d->canvas );
@@ -5135,11 +5135,11 @@ void View::slotUpdateChildGeometry( EmbeddedKOfficeObject */*_child*/ )
   assert( f != 0L );
 
   // Are we already up to date ?
-  if ( _child->geometry() == f->partGeometry() )
+  if ( _child->tqgeometry() == f->partGeometry() )
     return;
 
   // TODO zooming
-  f->setPartGeometry( _child->geometry() );
+  f->setPartGeometry( _child->tqgeometry() );
     */
 }
 
@@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ )
 //                 return 0;
 //     }
 //
-//     TQPtrListIterator<KoDocumentChild> it( doc()->children() );
+//     TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() );
 //     for (; it.current(); ++it )
 //     {
 //         // Is the child document on the visible sheet ?
@@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( )
 
   if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
-    p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 );
+    p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 );
   }
 
   d->popupListChoose->popup( p2 );
@@ -6401,7 +6401,7 @@ void View::styleDialog()
     d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) );
   }
   if ( d->canvas )
-    d->canvas->repaint();
+    d->canvas->tqrepaint();
 }
 
 void View::paperLayoutDlg()
@@ -6748,9 +6748,9 @@ void View::zoomMinus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 
 void View::zoomPlus()
@@ -6763,9 +6763,9 @@ void View::zoomPlus()
   if ( d->activeSheet != 0L )
     d->activeSheet->setLayoutDirtyFlag();
 
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 */
 
@@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet )
 void View::slotRefreshView()
 {
   refreshView();
-  d->canvas->repaint();
-  d->vBorderWidget->repaint();
-  d->hBorderWidget->repaint();
+  d->canvas->tqrepaint();
+  d->vBorderWidget->tqrepaint();
+  d->hBorderWidget->tqrepaint();
 }
 
 void View::slotUpdateView( Sheet *_sheet )
@@ -7209,7 +7209,7 @@ void View::transformPart()
 
     if ( d->transformToolBox.isNull() )
     {
-        d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() );
+        d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() );
         d->transformToolBox->show();
 
         d->transformToolBox->setDocumentChild( selectedChild() );
@@ -7537,7 +7537,7 @@ void View::runInspector()
 
 TQColor View::highlightColor()
 {
-    return TQApplication::palette().active().highlight().light( 175 );
+    return TQApplication::tqpalette().active().highlight().light( 175 );
 }
 
 } // namespace KSpread