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

---
 src/editor.cpp     | 16 ++++++++--------
 src/editor.h       |  4 ++--
 src/mainwindow.cpp |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/editor.cpp b/src/editor.cpp
index 470198b..3535c02 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -161,7 +161,7 @@ int EditorHighlighter::highlightParagraph ( const TQString & text, int )
 {
   if( !editor->isSyntaxHighlightEnabled() )
   {
-    setFormat( 0, text.length(), editor->tqcolorGroup().text() );
+    setFormat( 0, text.length(), editor->colorGroup().text() );
     return 0;
   }
 
@@ -224,7 +224,7 @@ Editor::Editor( TQWidget* parent, const char* name ):
   d->autoCalcTimer = new TQTimer( this );
   d->matchingTimer = new TQTimer( this );
 
-  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   setWordWrap( NoWrap );
   setHScrollBarMode( AlwaysOff );
   setVScrollBarMode( AlwaysOff );
@@ -261,7 +261,7 @@ Editor::~Editor()
   delete d;
 }
 
-TQSize Editor::tqsizeHint() const
+TQSize Editor::sizeHint() const
 {
   constPolish();
   TQFontMetrics fm = fontMetrics();
@@ -503,7 +503,7 @@ void Editor::triggerAutoComplete()
   TQStringList choices;
 
   for( unsigned i=0; i<fnames.count(); i++ )
-    if( fnames[i].tqstartsWith( id, false ) )
+    if( fnames[i].startsWith( id, false ) )
     {
       TQString str = fnames[i];
 
@@ -521,7 +521,7 @@ void Editor::triggerAutoComplete()
   TQStringList values = ValueManager::instance()->valueNames();
 
   for(TQStringList::ConstIterator it = values.begin(); it != values.end(); ++it)
-    if( (*it).tqstartsWith( id, false ) )
+    if( (*it).startsWith( id, false ) )
     {
       TQString choice = ValueManager::description(*it);
       if(choice.isEmpty())
@@ -758,11 +758,11 @@ EditorCompletion::EditorCompletion( Editor* editor ): TQObject( editor )
   d = new Private;
   d->editor = editor;
 
-  d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup );
+  d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup );
   d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
   d->completionPopup->setLineWidth( 1 );
   d->completionPopup->installEventFilter( this );
-  d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+  d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum);
 
   d->completionListBox = new TQListBox( d->completionPopup );
   d->completionPopup->setFocusProxy( d->completionListBox );
@@ -843,7 +843,7 @@ void EditorCompletion::showCompletion( const TQStringList &choices )
 
   // size of the pop-up
   d->completionPopup->setMaximumHeight( 120 );
-  d->completionPopup->resize( d->completionListBox->tqsizeHint() +
+  d->completionPopup->resize( d->completionListBox->sizeHint() +
            TQSize( d->completionListBox->verticalScrollBar()->width() + 4,
             d->completionListBox->horizontalScrollBar()->height() + 4 ) );
 
diff --git a/src/editor.h b/src/editor.h
index 3f7035a..7b61cf0 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -49,8 +49,8 @@ class Editor : public TQTextEdit
     Editor( TQWidget* parent = 0, const char* name = 0 );
     ~Editor();
 
-    TQSize tqsizeHint() const;
-    TQSize xtqminimumSizeHint() const;
+    TQSize sizeHint() const;
+    TQSize xminimumSizeHint() const;
 
     TQStringList history() const;
     void setHistory( const TQStringList& history );
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 613f513..2313f7a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -67,7 +67,7 @@ MainWindow::MainWindow() : KMainWindow(0, "abakus-mainwindow"), m_popup(0), m_in
     configLayout->addWidget(new TQWidget(configBox));
 
     TQLabel *label = new TQLabel(i18n("History: "), configBox);
-    label->tqsetAlignment(AlignCenter);
+    label->setAlignment(AlignCenter);
     configLayout->addWidget(label);
 
     TQButtonGroup *buttonGroup = new TQButtonGroup(0);
@@ -318,7 +318,7 @@ void MainWindow::slotUpdateSize()
     if(m_newSize != TQSize(0, 0))
         resize(m_newSize);
     else
-        resize(width(), tqminimumSize().height());
+        resize(width(), minimumSize().height());
 }
 
 void MainWindow::slotDegrees()
-- 
cgit v1.2.3