From e3649f744289c180537d2d8474dc0e39050e654f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78)

---
 knode/kncomposer.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'knode/kncomposer.cpp')

diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index af9132d70..b63880df6 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
 
 void KNComposer::slotUndo()
 {
-    TQWidget* fw = tqfocusWidget();
+    TQWidget* fw = focusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -443,7 +443,7 @@ void KNComposer::slotUndo()
 
 void KNComposer::slotRedo()
 {
-    TQWidget* fw = tqfocusWidget();
+    TQWidget* fw = focusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -454,7 +454,7 @@ void KNComposer::slotRedo()
 
 void KNComposer::slotCut()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -466,7 +466,7 @@ void KNComposer::slotCut()
 
 void KNComposer::slotCopy()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -480,7 +480,7 @@ void KNComposer::slotCopy()
 
 void KNComposer::slotPaste()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -492,7 +492,7 @@ void KNComposer::slotPaste()
 
 void KNComposer::slotSelectAll()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
@@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   ts.setCodec(codec);
 
   if (box)
-    temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle);
+    temp = TQString::fromLatin1(",----[ %1 ]\n").tqarg(boxTitle);
 
   if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) {
     int wrapAt = v_iew->e_dit->wrapColumnOrWidth();
@@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   }
 
   if (box)
-    temp += TQString::tqfromLatin1("`----");
+    temp += TQString::fromLatin1("`----");
 
   if(clear)
     v_iew->e_dit->setText(temp);
@@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t)
   split.init(t.latin1(), ",");
   splitOk=split.first();
   while(splitOk) {
-    v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string()));
+    v_iew->f_up2->insertItem(TQString::fromLatin1(split.string()));
     splitOk=split.next();
   }
   v_iew->f_up2->insertItem("");
@@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *
   spell = 0L;
   installEventFilter(this);
   KCursor::setAutoHideCursor( this, true, true );
-  m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") );
+  m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") );
 }
 
 
@@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox()
   } else {
     int l = currentLine();
     int c = currentColumn();
-    TQString s = TQString::tqfromLatin1(",----[  ]\n| %1\n`----").tqarg(textLine(l));
+    TQString s = TQString::fromLatin1(",----[  ]\n| %1\n`----").tqarg(textLine(l));
     insertLine(s,l);
     removeLine(l+3);
     setCursorPosition(l+1,c+2);
@@ -2244,7 +2244,7 @@ void KNComposer::Editor::slotAddBox()
 void KNComposer::Editor::slotRemoveBox()
 {
   if (hasMarkedText()) {
-    TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n");
+    TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n");
     s.replace(TQRegExp("\n,----[^\n]*\n"),"\n");
     s.replace(TQRegExp("\n| "),"\n");
     s.replace(TQRegExp("\n`----[^\n]*\n"),"\n");
@@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
     this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&)));
 
   //finish GUI
-  setFixedHeight(tqsizeHint().height());
+  setFixedHeight(sizeHint().height());
   KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250));
   setHelp("anc-knode-editor-advanced");
 }
-- 
cgit v1.2.1