Rename obsolete tq methods to standard names

12 files changed, 90 insertions, 90 deletions

diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp
index 6428c1fd4..74e8572b5 100644
--- a/kivio/kiviopart/config/kivio_config.cpp
+++ b/kivio/kiviopart/config/kivio_config.cpp
@@ -28,30 +28,30 @@ namespace Kivio {
 
   KoPageLayout Config::defaultPageLayout()
   {
-    KoPageLayout tqlayout;
+    KoPageLayout layout;
     
-    tqlayout.format = KoPageFormat::formatFromString(Settings::format());
-    tqlayout.orientation = Kivio::orientationFromString(Settings::orientation());
-    tqlayout.ptTop = Settings::borderTop();
-    tqlayout.ptBottom = Settings::borderBottom();
-    tqlayout.ptLeft = Settings::borderLeft();
-    tqlayout.ptRight = Settings::borderRight();
-    tqlayout.ptWidth = Settings::width();
-    tqlayout.ptHeight = Settings::height();
+    layout.format = KoPageFormat::formatFromString(Settings::format());
+    layout.orientation = Kivio::orientationFromString(Settings::orientation());
+    layout.ptTop = Settings::borderTop();
+    layout.ptBottom = Settings::borderBottom();
+    layout.ptLeft = Settings::borderLeft();
+    layout.ptRight = Settings::borderRight();
+    layout.ptWidth = Settings::width();
+    layout.ptHeight = Settings::height();
     
-    return tqlayout;
+    return layout;
   }
   
-  void Config::setDefaultPageLayout(const KoPageLayout& tqlayout)
+  void Config::setDefaultPageLayout(const KoPageLayout& layout)
   {
-    Settings::setFormat(KoPageFormat::formatString(tqlayout.format));
-    Settings::setOrientation(Kivio::orientationString(tqlayout.orientation));
-    Settings::setBorderTop(tqlayout.ptTop);
-    Settings::setBorderBottom(tqlayout.ptBottom);
-    Settings::setBorderLeft(tqlayout.ptLeft);
-    Settings::setBorderRight(tqlayout.ptRight);
-    Settings::setWidth(tqlayout.ptWidth);
-    Settings::setHeight(tqlayout.ptHeight);
+    Settings::setFormat(KoPageFormat::formatString(layout.format));
+    Settings::setOrientation(Kivio::orientationString(layout.orientation));
+    Settings::setBorderTop(layout.ptTop);
+    Settings::setBorderBottom(layout.ptBottom);
+    Settings::setBorderLeft(layout.ptLeft);
+    Settings::setBorderRight(layout.ptRight);
+    Settings::setWidth(layout.ptWidth);
+    Settings::setHeight(layout.ptHeight);
   }
 
   void Config::setGrid(const KivioGridData& /*grid*/)
diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h
index b4df785a4..651ec121a 100644
--- a/kivio/kiviopart/config/kivio_config.h
+++ b/kivio/kiviopart/config/kivio_config.h
@@ -34,12 +34,12 @@ namespace Kivio {
   {
     public:
       /**
-      * Set the default page tqlayout
+      * Set the default page layout
       */
-      static void setDefaultPageLayout(const KoPageLayout& tqlayout);
+      static void setDefaultPageLayout(const KoPageLayout& layout);
 
       /**
-      * Get the default page tqlayout
+      * Get the default page layout
       */
       static KoPageLayout defaultPageLayout();
 
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 30ef38502..e2125cbb8 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev )
   painter.save();
   painter.setClipRegion(grayRegion, TQPainter::CoordPainter);
   painter.setPen(TQt::NoPen);
-  painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid));
+  painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid));
   painter.restore();
   // end of copy...
 
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 300488c6e..5a9d0a772 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -307,7 +307,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis();
     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);
     styles.lookup(masterPage, "Standard", false);
 
     if(!store->open("content.xml")) {
@@ -345,7 +345,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin();
 
     for ( ; it != styleList.end(); ++it) {
-        (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties");
+        (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties");
     }
 
     styleList = styles.styles(Kivio::STYLE_PAGE);
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 0b60344ba..a52f522b7 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -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();
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 340a5124f..cdc550af5 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -245,14 +245,14 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
           &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int)));
   connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*)));
 
-  TQGridLayout* tqlayout = new TQGridLayout(pRightSide);
-  tqlayout->addWidget(hRuler, 0, 1);
-  tqlayout->addWidget(vRuler, 1, 0);
-  tqlayout->addWidget(canvasBase, 1, 1);
-  tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
-  tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
-  tqlayout->setRowStretch(1, 10);
-  tqlayout->setColStretch(1, 10);
+  TQGridLayout* layout = new TQGridLayout(pRightSide);
+  layout->addWidget(hRuler, 0, 1);
+  layout->addWidget(vRuler, 1, 0);
+  layout->addWidget(canvasBase, 1, 1);
+  layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1);
+  layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2);
+  layout->setRowStretch(1, 10);
+  layout->setColStretch(1, 10);
 
   TQWidget::setFocusPolicy( TQ_StrongFocus );
   setFocusProxy( m_pCanvas );
@@ -390,7 +390,7 @@ void KivioView::setupActions()
   m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" );
   m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" );
   m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" );
-  connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
+  connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged()));
 
   m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils");
   m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils");
@@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager()
 
 void KivioView::clipboardDataChanged()
 {
-  TQMimeSource* data = TQApplication::tqclipboard()->data();
+  TQMimeSource* data = TQApplication::clipboard()->data();
   KivioDragObject decoder(this);
   bool paste = decoder.canDecode(data);
   m_editPaste->setEnabled(paste);
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index 7479af081..201eea08c 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -44,52 +44,52 @@ struct PaperSizeDef {
   int unit;
 };
 
-void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout)
+void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& layout)
 {
-  XmlWriteFloat(e, "width", tqlayout.ptWidth);
-  XmlWriteFloat(e, "height", tqlayout.ptHeight);
-  XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft);
-  XmlWriteFloat(e, "marginRight", tqlayout.ptRight);
-  XmlWriteFloat(e, "marginTop", tqlayout.ptTop);
-  XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom);
-  XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format));
-  XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation));
+  XmlWriteFloat(e, "width", layout.ptWidth);
+  XmlWriteFloat(e, "height", layout.ptHeight);
+  XmlWriteFloat(e, "marginLeft", layout.ptLeft);
+  XmlWriteFloat(e, "marginRight", layout.ptRight);
+  XmlWriteFloat(e, "marginTop", layout.ptTop);
+  XmlWriteFloat(e, "marginBottom", layout.ptBottom);
+  XmlWriteString(e, "format", KoPageFormat::formatString(layout.format));
+  XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation));
 }
 
-// ## TODO: remove this method, now that tqlayout.saveOasis() does it all
-KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout)
+// ## TODO: remove this method, now that layout.saveOasis() does it all
+KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout)
 {
-  return tqlayout.saveOasis();
+  return layout.saveOasis();
 }
 
 KoPageLayout Kivio::loadPageLayout(const TQDomElement& e)
 {
-  KoPageLayout tqlayout;
+  KoPageLayout layout;
 
   if(e.hasAttribute("unit")) {
     // Compatibility with Kivio <= 1.2.x
     kdDebug(43000) << "Compatibility mode..." << endl;
     KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0));
-    tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
-    tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
-    tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
-    tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
-    tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
-    tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
-    Kivio::setFormatOrientation(tqlayout);
+    layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit);
+    layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit);
+    layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit);
+    layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit);
+    layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit);
+    layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit);
+    Kivio::setFormatOrientation(layout);
     kdDebug(43000) << "Ready." << endl;
   } else {
-    tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0);
-    tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0);
-    tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
-    tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
-    tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
-    tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
-    tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
-    tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
+    layout.ptWidth = XmlReadFloat(e, "width", 0.0);
+    layout.ptHeight = XmlReadFloat(e, "height", 0.0);
+    layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0);
+    layout.ptRight = XmlReadFloat(e, "marginRight", 0.0);
+    layout.ptTop = XmlReadFloat(e, "marginTop", 0.0);
+    layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0);
+    layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize())));
+    layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait"));
   }
 
-  return tqlayout;
+  return layout;
 }
 
 KoUnit::Unit Kivio::convToKoUnit(int tkUnit)
@@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const TQString& s)
   return PG_PORTRAIT;
 }
 
-void Kivio::setFormatOrientation(KoPageLayout& tqlayout)
+void Kivio::setFormatOrientation(KoPageLayout& layout)
 {
   const PaperSizeDef PapersTable[] = {
     {"A0",841,1189,KoUnit::U_MM},
@@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& tqlayout)
   PaperSizeDef sizeDef = PapersTable[0];
   bool found = false;
   float width, height;
-  tqlayout.format = PG_CUSTOM;
-  tqlayout.orientation = PG_PORTRAIT;
+  layout.format = PG_CUSTOM;
+  layout.orientation = PG_PORTRAIT;
 
   while((sizeDef.unit != -2) && !found) {
     width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit));
     height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit));
 
-    if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) {
-      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
-      tqlayout.orientation = PG_PORTRAIT;
+    if((layout.ptWidth == width) && (layout.ptHeight == height)) {
+      layout.format = KoPageFormat::formatFromString(sizeDef.title);
+      layout.orientation = PG_PORTRAIT;
       found = true;
-    } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) {
-      tqlayout.format = KoPageFormat::formatFromString(sizeDef.title);
-      tqlayout.orientation = PG_LANDSCAPE;
+    } else if((layout.ptWidth == height) && (layout.ptHeight == width)) {
+      layout.format = KoPageFormat::formatFromString(sizeDef.title);
+      layout.orientation = PG_LANDSCAPE;
       found = true;
     }
 
diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h
index 1e94f79b3..cd0fe3d68 100644
--- a/kivio/kiviopart/kivioglobal.h
+++ b/kivio/kiviopart/kivioglobal.h
@@ -37,12 +37,12 @@ namespace Kivio
   };
 
   /**
-   * Save a page tqlayout to a TQDomElement
+   * Save a page layout to a TQDomElement
    */
-  void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout);
-  KoGenStyle savePageLayout(const KoPageLayout& tqlayout);
+  void savePageLayout(TQDomElement& e, const KoPageLayout& layout);
+  KoGenStyle savePageLayout(const KoPageLayout& layout);
   /**
-   * Load a page tqlayout from a TQDomElement
+   * Load a page layout from a TQDomElement
    */
   KoPageLayout loadPageLayout(const TQDomElement& e);
   /**
@@ -57,7 +57,7 @@ namespace Kivio
    * Return the orientation based on the string
    */
   KoOrientation orientationFromString(const TQString& s);
-  void setFormatOrientation(KoPageLayout& tqlayout);
+  void setFormatOrientation(KoPageLayout& layout);
 
   /**
    * Load a KoSize from a TQDomElement
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp
index bb95c94ad..3dd8b428b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp
@@ -330,7 +330,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val )
  * across two quadrants, you need to determine which side of the test point it crossed, and then
  * either add or subtract 2.
  *
- * Quad tqlayout:
+ * Quad layout:
  *   1 2
  *   4 3
  */
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 8969ea827..30cf7f1f6 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView()
 
   KivioScreenPainter kpainter;
   kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
-  kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid));
+  kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid));
 
   kpainter.painter()->fillRect(px0, py0, pw, ph, white);
 
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 14a3c86d5..5621074d7 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -111,7 +111,7 @@ void KivioOptionsDialog::initPage()
   m_unitCombo->insertStringList(KoUnit::listOfUnitName());
   m_unitCombo->setCurrentItem(unit);
   unitLbl->setBuddy(m_unitCombo);
-  TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
+  TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), page);
   m_layoutTxtLbl = new TQLabel(page);
   m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
   m_layoutTxtLbl->setSizePolicy(TQSizePolicy(
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 7483e98d3..fbe094e5c 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
 {
   m_blockUpdate = false;
 
-  TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2);
+  TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2);
 
   m_objectList = new KListView(this);
   m_objectList->setFullWidth(true);
@@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
   m_objectList->addColumn(i18n("Name"));
   m_objectList->addColumn(i18n("Type"));
 
-  tqlayout->addWidget(m_objectList);
+  layout->addWidget(m_objectList);
 
   connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection()));
 }