From 210d3838389a3deb30baa203d635da1e46e2242a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 24 Dec 2011 11:37:01 -0600
Subject: [PATCH] Rename a few stragglers (cherry picked from commit
 960d035bd736ca67a468424eed182f21cb0b1f35)

---
 ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui | 2 +-
 ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp       | 2 +-
 ksquirrel/ksquirrelpart/sq_imageproperties.ui       | 2 +-
 ksquirrel/sq_codecsettingsskeleton.ui               | 2 +-
 ksquirrel/sq_glwidget_stuff.cpp                     | 2 +-
 ksquirrel/sq_imageproperties.ui                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
index 94cde9f..345b1be 100644
--- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
+++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
@@ -191,7 +191,7 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
     <include location="global" impldecl="in implementation">tqspinbox.h</include>
-    <include location="global" impldecl="in implementation">tqtextedit.h</include>
+    <include location="global" impldecl="in implementation">textedit.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="local" impldecl="in implementation">sq_codecsettingsskeleton.ui.h</include>
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 662a637..041fa03 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -646,7 +646,7 @@ void SQ_GLWidget::toClipboard()
     if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h)
         KApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
     else
-        KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
+        KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
 }
 
 void SQ_GLWidget::bcg()
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
index 0cb55f9..1651c2f 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
@@ -926,7 +926,7 @@
     <include location="global" impldecl="in implementation">kstdaction.h</include>
     <include location="global" impldecl="in implementation">kaction.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
-    <include location="global" impldecl="in implementation">tqclipboard.h</include>
+    <include location="global" impldecl="in implementation">clipboard.h</include>
     <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
     <include location="global" impldecl="in implementation">tqbuttongroup.h</include>
diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/ksquirrel/sq_codecsettingsskeleton.ui
index 94cde9f..345b1be 100644
--- a/ksquirrel/sq_codecsettingsskeleton.ui
+++ b/ksquirrel/sq_codecsettingsskeleton.ui
@@ -191,7 +191,7 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
     <include location="global" impldecl="in implementation">tqspinbox.h</include>
-    <include location="global" impldecl="in implementation">tqtextedit.h</include>
+    <include location="global" impldecl="in implementation">textedit.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="local" impldecl="in implementation">sq_codecsettingsskeleton.ui.h</include>
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 662a637..041fa03 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -646,7 +646,7 @@ void SQ_GLWidget::toClipboard()
     if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h)
         KApplication::clipboard()->setImage(im, TQClipboard::Clipboard);
     else
-        KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
+        KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard);
 }
 
 void SQ_GLWidget::bcg()
diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui
index c75f810..90b31ea 100644
--- a/ksquirrel/sq_imageproperties.ui
+++ b/ksquirrel/sq_imageproperties.ui
@@ -926,7 +926,7 @@
     <include location="global" impldecl="in implementation">kstdaction.h</include>
     <include location="global" impldecl="in implementation">kaction.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
-    <include location="global" impldecl="in implementation">tqclipboard.h</include>
+    <include location="global" impldecl="in implementation">clipboard.h</include>
     <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
     <include location="global" impldecl="in implementation">tqbuttongroup.h</include>