From 2007255ef3c315bc1dae29043caaa40a16699a29 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 24 Dec 2011 11:57:19 -0600
Subject: Rename a few stragglers

---
 kdevdesigner/designer/mainwindow.cpp           |  2 +-
 languages/cpp/debugger/gdbbreakpointwidget.cpp |  6 ++--
 languages/cpp/doc/kde2book.toc                 | 42 +++++++++++++-------------
 languages/php/doc/php.toc                      |  8 ++---
 languages/python/doc/python.toc                | 10 +++---
 lib/widgets/fancylistviewitem.cpp              |  2 +-
 src/newui/button.cpp                           |  2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 5221ec9c..bb213135 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -794,7 +794,7 @@ void MainWindow::helpContents()
 	    if ( classname.lower() == "spacer" )
 		source = "qspaceritem.html#details";
 	    else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
-		source = "tqlayout.html";
+		source = "layout.html";
 	    else
 		source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
 	}
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 5c69502d..fcca7a36 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -1213,7 +1213,7 @@ TQWidget* ComplexEditCell::createEditor() const
 {
     TQHBox* box = new TQHBox( table()->viewport() );
     box->setPaletteBackgroundColor(
-               table()->tqpalette().active().highlight());
+               table()->palette().active().highlight());
 
     label_ = new TQLabel(text(), box, "label");
     label_->setBackgroundMode(TQt::PaletteHighlight);
@@ -1225,9 +1225,9 @@ TQWidget* ComplexEditCell::createEditor() const
     TQPalette p = label_->palette();
 
     p.setColor(TQPalette::Active, TQColorGroup::Foreground,
-               table()->tqpalette().active().highlightedText());
+               table()->palette().active().highlightedText());
     p.setColor(TQPalette::Inactive, TQColorGroup::Foreground,
-               table()->tqpalette().active().highlightedText());
+               table()->palette().active().highlightedText());
 
     label_->setPalette(p);
 
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 4850d343..e10972d4 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -405,7 +405,7 @@
 <entry name="CDE (Common Desktop Environment)" url="ch01.html"/>
 <entry name="cgi resource type" url="ch07lev1sec4.html"/>
 <entry name="CGotoDialog class, modeless dialog box" url="ch08lev1sec3.html"/>
-<entry name="CGotoDialog example, tqlayout" url="ch08lev1sec2.html"/>
+<entry name="CGotoDialog example, layout" url="ch08lev1sec2.html"/>
 <entry name="Chapter tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="checking out, applications (CVS)" url="ch17lev1sec5.html"/>
 <entry name="checking spelling" url="ch10lev1sec3.html"/>
@@ -729,7 +729,7 @@
 <entry name="deleting, CVS (Concurrent Version System) directories" url="ch17lev1sec5.html"/>
 <entry name="deleting, CVS (Concurrent Version System) files" url="ch17lev1sec5.html"/>
 <entry name="deprecated (" url="ch15.html"/>
-<entry name="design guidelines, dialog boxes, tqlayout issues" url="ch08lev1sec2.html"/>
+<entry name="design guidelines, dialog boxes, layout issues" url="ch08lev1sec2.html"/>
 <entry name="design guidelines, dialog boxes" url="ch08lev1sec7.html"/>
 <entry name="designing, icons" url="ch06lev1sec3.html"/>
 <entry name="Desktop Communication Protocol. See DCOP" url="ch13.html"/>
@@ -760,13 +760,13 @@
 <entry name="dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
 <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/>
-<entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, design issues" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, hierarchies of layouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, manual placement" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, nested layouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, layout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog located on the stack" url="ch08lev1sec3.html"/>
@@ -1130,7 +1130,7 @@
 <entry name="GUIs, dialog boxes, tdeui (KDE user-interface library)" url="ch08lev1sec4.html"/>
 <entry name="GUIs, dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="GUIs, dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
-<entry name="GUIs, dialog boxes, tqlayout" url="ch08lev1sec2.html"/>
+<entry name="GUIs, dialog boxes, layout" url="ch08lev1sec2.html"/>
 <entry name="GUIs, dialog boxes, modal" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, modeless" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, simple example" url="ch08.html"/>
@@ -1591,15 +1591,15 @@
 <entry name="languages, i18n() function" url="ch06lev1sec4.html"/>
 <entry name="languages, translator files" url="ch06lev1sec4.html"/>
 <entry name="lastPage action" url="ch06.html"/>
-<entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
-<entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
-<entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
+<entry name="layout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="layout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="layout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="leaveEvent() event handler, widgets" url="ch04.html"/>
 <entry name="legal issues" url="ch01lev1sec6.html"/>
 <entry name="legal issues" url="ch19.html"/>
@@ -2268,7 +2268,7 @@
 <entry name="QDataStream objects" url="ch13lev1sec3.html"/>
 <entry name="QGL widget" url="ch03lev1sec6.html"/>
 <entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/>
-<entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QHBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QImage class" url="ch10lev1sec2.html"/>
 <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/>
 <entry name="QLayout classes, design issues" url="ch08lev1sec2.html"/>
@@ -2327,7 +2327,7 @@
 <entry name="Qt, utility classes" url="ch03lev1sec5.html"/>
 <entry name="queryClose() function" url="ch07lev1sec3.html"/>
 <entry name="quit action" url="ch06.html"/>
-<entry name="QVBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QVBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QWidget class, attributes" url="ch04.html"/>
 <entry name="QWidget class, documentation" url="ch04.html"/>
 <entry name="QWidget class, event handlers, closeEvent()" url="ch04.html"/>
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index 5fd58ac7..a148c1c0 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -4512,7 +4512,7 @@
 <entry name="HaruDoc::getEncoder" url="function.harudoc-getencoder.php"/>
 <entry name="HaruDoc::getFont" url="function.harudoc-getfont.php"/>
 <entry name="HaruDoc::getInfoAttr" url="function.harudoc-getinfoattr.php"/>
-<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagetqlayout.php"/>
+<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagelayout.php"/>
 <entry name="HaruDoc::getPageMode" url="function.harudoc-getpagemode.php"/>
 <entry name="HaruDoc::getStreamSize" url="function.harudoc-getstreamsize.php"/>
 <entry name="HaruDoc::insertPage" url="function.harudoc-insertpage.php"/>
@@ -4534,7 +4534,7 @@
 <entry name="HaruDoc::setInfoAttr" url="function.harudoc-setinfoattr.php"/>
 <entry name="HaruDoc::setInfoDateAttr" url="function.harudoc-setinfodateattr.php"/>
 <entry name="HaruDoc::setOpenAction" url="function.harudoc-setopenaction.php"/>
-<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagetqlayout.php"/>
+<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagelayout.php"/>
 <entry name="HaruDoc::setPageMode" url="function.harudoc-setpagemode.php"/>
 <entry name="HaruDoc::setPagesConfiguration" url="function.harudoc-setpagesconfiguration.php"/>
 <entry name="HaruDoc::setPassword" url="function.harudoc-setpassword.php"/>
@@ -4639,7 +4639,7 @@
 <entry name="HaruFont::getEncodingName" url="function.harufont-getencodingname.php"/>
 <entry name="HaruFont::getFontName" url="function.harufont-getfontname.php"/>
 <entry name="HaruFont::getTextWidth" url="function.harufont-gettextwidth.php"/>
-<entry name="HaruFont::getUnicodeWidth" url="function.harufont-gettqunicodewidth.php"/>
+<entry name="HaruFont::getUnicodeWidth" url="function.harufont-getunicodewidth.php"/>
 <entry name="HaruFont::getXHeight" url="function.harufont-getxheight.php"/>
 <entry name="HaruFont::measureText" url="function.harufont-measuretext.php"/>
 <entry name="HaruImage::getBitsPerComponent" url="function.haruimage-getbitspercomponent.php"/>
@@ -4651,7 +4651,7 @@
 <entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/>
 <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/>
 <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/>
-<entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/>
+<entry name="HaruEncoder::getUnicode" url="function.haruencoder-getunicode.php"/>
 <entry name="HaruEncoder::getWritingMode" url="function.haruencoder-getwritingmode.php"/>
 <entry name="HaruOutline::setDestination" url="function.haruoutline-setdestination.php"/>
 <entry name="HaruOutline::setOpened" url="function.haruoutline-setopened.php"/>
diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc
index 342e213c..a0352dcc 100644
--- a/languages/python/doc/python.toc
+++ b/languages/python/doc/python.toc
@@ -293,7 +293,7 @@
 </tocsect3>
 <tocsect3 name="7.2 Sequence Objects " url="api/sequenceObjects.html">
 <tocsect4 name="7.2.1 String Objects " url="api/stringObjects.html"/>
-<tocsect4 name="7.2.2 Unicode Objects " url="api/tqunicodeObjects.html"/>
+<tocsect4 name="7.2.2 Unicode Objects " url="api/unicodeObjects.html"/>
 <tocsect4 name="7.2.3 Buffer Objects " url="api/bufferObjects.html"/>
 <tocsect4 name="7.2.4 Tuple Objects " url="api/tupleObjects.html"/>
 <tocsect4 name="7.2.5 List Objects " url="api/listObjects.html"/>
@@ -410,7 +410,7 @@
 <tocsect3 name="4.7 codecs -- Codec registry and base classes" url="lib/module-codecs.html">
 <tocsect4 name="4.7.1 Codec Base Classes" url="lib/node80.html"/>
 </tocsect3>
-<tocsect3 name="4.8 tqunicodedata -- Unicode Database" url="lib/module-tqunicodedata.html"/>
+<tocsect3 name="4.8 unicodedata -- Unicode Database" url="lib/module-unicodedata.html"/>
 </tocsect2>
 <tocsect2 name="5. Miscellaneous Services" url="lib/misc.html">
 <tocsect3 name="5.1 math -- Mathematical functions" url="lib/module-math.html"/>
@@ -1362,7 +1362,7 @@
 <entry name="string" url="ref/types.html#l2h-85"/>
 <entry name="object (continued), traceback" url="ref/types.html#l2h-127"/>
 <entry name="object (continued), tuple" url="ref/types.html#l2h-91"/>
-<entry name="object (continued), tqunicode" url="ref/types.html#l2h-90"/>
+<entry name="object (continued), unicode" url="ref/types.html#l2h-90"/>
 <entry name="object (continued), user-defined function" url="ref/types.html#l2h-103"/>
 <entry name="object (continued), user-defined method" url="ref/types.html#l2h-105"/>
 <entry name="oct() (built-in function)" url="ref/numeric-types.html#l2h-229"/>
@@ -1544,8 +1544,8 @@
 <entry name="unbinding, name" url="ref/execframes.html#l2h-243"/>
 <entry name="unichr() (built-in function)" url="ref/types.html#l2h-87"/>
 <entry name="Unicode" url="ref/types.html#l2h-90"/>
-<entry name="tqunicode() (built-in function)" url="ref/types.html#l2h-89"/>
-<entry name="tqunicode object" url="ref/types.html#l2h-90"/>
+<entry name="unicode() (built-in function)" url="ref/types.html#l2h-89"/>
+<entry name="unicode object" url="ref/types.html#l2h-90"/>
 <entry name="UNIX" url="ref/programs.html#l2h-439"/>
 <entry name="unreachable object" url="ref/objects.html#l2h-28"/>
 <entry name="unrecognized escape sequence" url="ref/strings.html#l2h-19"/>
diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp
index 85aad639..6956636e 100644
--- a/lib/widgets/fancylistviewitem.cpp
+++ b/lib/widgets/fancylistviewitem.cpp
@@ -108,7 +108,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
         if ( isEnabled() || !lv ) 
             p->setPen( cg.highlightedText() );
         else if ( !isEnabled() && lv)
-            p->setPen( lv->tqpalette().disabled().highlightedText() );
+            p->setPen( lv->palette().disabled().highlightedText() );
     } 
     {
         if ( isEnabled() || !lv )
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 1a433252..311e3631 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -131,7 +131,7 @@ void Button::drawButton(TQPainter *p)
     pm.fill(eraseColor());
     TQPainter p2(&pm);
 
-    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
+    style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
 
     style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
-- 
cgit v1.2.3