1 files changed, 9 insertions, 9 deletions

diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 0b60344b..41fe984b 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -30,10 +30,10 @@
 #include <tqptrstack.h>
 #include <tqbuffer.h>
 #include <tqmessagebox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpicture.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdragobject.h>
 #include <tqmime.h>
 #include <tqsortedlist.h>
@@ -153,7 +153,7 @@ TQDomElement KivioPage::save( TQDomDocument& doc )
     page.setAttribute( "name", m_strName );
     page.setAttribute( "hide", (int)m_bPageHide );
 
-    // Create a child element for the page tqlayout
+    // Create a child element for the page layout
     TQDomElement layoutE = saveLayout( doc );
     page.appendChild( layoutE );
 
@@ -194,7 +194,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
     TQString layoutName = styles->lookup(pageLayout, "PL");
 
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-tqlayout-name", layoutName);
+    masterPage.addAttribute("style:page-layout-name", layoutName);
     TQString masterName = styles->lookup(masterPage, "MP");
 
     docWriter->addAttribute("draw:master-page-name", masterName);
@@ -324,17 +324,17 @@ bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles)
     return false;
   }
 
-  const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) );
+  const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) );
 
   if(!pageLayout) {
-    kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl;
+    kdDebug(430000) << "Couldn't find the pagelayout!" << endl;
     return false;
   }
 
   m_pPageLayout.loadOasis(*pageLayout);
 
   if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) {
-    kdDebug(430000) << "Non valid pagetqlayout!" << endl;
+    kdDebug(430000) << "Non valid pagelayout!" << endl;
     return false;
   }
 
@@ -941,7 +941,7 @@ void KivioPage::copy()
   KivioDragObject* kdo = new KivioDragObject();
   kdo->setStencilList(m_lstSelection);
   kdo->setStencilRect(getRectForAllSelectedStencils());
-  TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard);
+  TQApplication::clipboard()->setData(kdo, TQClipboard::Clipboard);
 }
 
 void KivioPage::cut()
@@ -987,7 +987,7 @@ void KivioPage::paste(KivioView* view)
   list.setAutoDelete(false);
   KivioDragObject kdo;
 
-  if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) {
+  if(kdo.decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), list, this)) {
     unselectAllStencils();
     KivioStencil* stencil = list.first();