From 2d6954f69caf63ed5057bd8e1405a65d7d970292 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:05:41 -0600
Subject: Rename obsolete tq methods to standard names

---
 kpresenter/KPrDocument.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kpresenter/KPrDocument.cpp')

diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index fca675d5c..1aa505ebe 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
     saveOnlyPage = -1;
     m_maxRecentFiles = 10;
 
-    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
              this, TQT_SLOT( clipboardDataChanged() ) );
 
     m_commandHistory = new KoCommandHistory( actionCollection(),  true ) ;
@@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl
         Q_ASSERT( styles.count() == 1 );
         it = styles.begin();
         for ( ; it != styles.end() ; ++it ) {
-            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
+            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
             stylesWriter->endElement();
         }
 
@@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" masterPageName:"<<masterPageName<<endl;
         if ( ! master )
         {
-            masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter)
+            masterPageName = "Standard"; // use default layout as fallback (default in kpresenter)
             master = oasisStyles.masterPages()[ masterPageName];
             if ( !master ) //last test...
                 master = oasisStyles.masterPages()["Default"];
@@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" end load oasis master style \n";
 
         Q_ASSERT( master );
-        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0;
+        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0;
         const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" );
         kdDebug()<<"Standard background "<<backgroundStyle<<endl;
         // parse all pages
@@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                     if ( !note.isEmpty() )
                         note += "\n";
 
-                    //todo load tqlayout for note.
+                    //todo load layout for note.
                     TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" );
 
                     if ( !textBox.isNull() )
@@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
                 else if(borders.hasAttribute("mmBottom"))    //compatibility
                     __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() );
             }
-            // PAPER found and parsed -> apply page tqlayout
+            // PAPER found and parsed -> apply page layout
             // e.g. the text objects need it
             if ( _clean )
                 setPageLayout( __pgLayout );
@@ -3276,11 +3276,11 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout )
     //    m_pageList.at( i )->updateBackgroundSize();
 
     repaint( false );
-    tqlayout();
+    layout();
     // don't setModified(true) here, since this is called on startup
 }
 
-//when we change pagetqlayout we must re-position header/footer
+//when we change pagelayout we must re-position header/footer
 void KPrDocument::updateHeaderFooterPosition( )
 {
     KoRect pageRect=m_masterPage->getPageRect();
@@ -3423,19 +3423,19 @@ void KPrDocument::repaint( const TQRect& rect )
     }
 }
 
-void KPrDocument::tqlayout(KPrObject *kpobject)
+void KPrDocument::layout(KPrObject *kpobject)
 {
     KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject );
     if (obj)
-        obj->tqlayout();
+        obj->layout();
 }
 
-void KPrDocument::tqlayout()
+void KPrDocument::layout()
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->tqlayout();
+        canvas->layout();
     }
 }
 
@@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum )
     KURL url; url.setPath( tempFile.name() );
     KURL::List lst;
     lst.append( url );
-    TQApplication::tqclipboard()->setData( new KURLDrag( lst ) );
+    TQApplication::clipboard()->setData( new KURLDrag( lst ) );
     m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged
 }
 
@@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged()
     }
     // TODO enable paste as well, when a txtobject is activated
     // and there is plain text in the clipboard. Then enable this code.
-    //TQMimeSource *data = TQApplication::tqclipboard()->data();
+    //TQMimeSource *data = TQApplication::clipboard()->data();
     //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" );
     // emit enablePaste( canPaste );
 }
@@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ )
         for (; it.current(); ++it )
         {
             static_cast<KPrView *>( it.current() )->getCanvas()->update();
-            static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout();
+            static_cast<KPrView *>( it.current() )->getCanvas()->layout();
         }
     }
 }
-- 
cgit v1.2.3