Rename old tq methods that no longer need a unique name

(cherry picked from commit 628043be55ddd2f534411d028e4f68c8fe4eaabb)

8 files changed, 28 insertions, 28 deletions

diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 38862fb18..31d4f5f82 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -814,7 +814,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
   int y,x,len;
   const TQPixmap* pm = backgroundPixmap();
   TQPainter paint;
-  tqsetUpdatesEnabled(false);
+  setUpdatesEnabled(false);
   paint.begin( this );
 
   TQPoint tL  = contentsRect().topLeft();
@@ -926,7 +926,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
   }
   drawFrame( &paint );
   paint.end();
-  tqsetUpdatesEnabled(true);
+  setUpdatesEnabled(true);
   if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms
   if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; }
   free(dirtyMask);
@@ -954,7 +954,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
         mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget);
         l->addWidget(mResizeLabel, 1, AlignCenter);
         mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20);
-        mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20);
+        mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20);
         mResizeTimer = new TQTimer(this);
         connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
      }
@@ -993,7 +993,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
 {
   const TQPixmap* pm = backgroundPixmap();
   TQPainter paint;
-  tqsetUpdatesEnabled(false);
+  setUpdatesEnabled(false);
   paint.begin( this );
   paint.setBackgroundMode( Qt::TransparentMode );
 
@@ -1051,7 +1051,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
   erase( er );
 
   paint.end();
-  tqsetUpdatesEnabled(true);
+  setUpdatesEnabled(true);
 }
 
 void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
@@ -1185,9 +1185,9 @@ void TEWidget::propagateSize()
   if (isFixedSize)
   {
      setSize(columns, lines);
-     TQFrame::setFixedSize(tqsizeHint());
+     TQFrame::setFixedSize(sizeHint());
      parentWidget()->adjustSize();
-     parentWidget()->setFixedSize(parentWidget()->tqsizeHint());
+     parentWidget()->setFixedSize(parentWidget()->sizeHint());
      return;
   }
   if (image)
@@ -1880,7 +1880,7 @@ void TEWidget::doScroll(int lines)
 bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
 {
   if ( (e->type() == TQEvent::Accel ||
-       e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this )
+       e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this )
   {
       TQT_TQKEYEVENT( e )->ignore();
       return false;
@@ -2104,7 +2104,7 @@ void TEWidget::clearImage()
 
 void TEWidget::calcGeometry()
 {
-  scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+  scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
                     contentsRect().height());
   switch(scrollLoc)
   {
@@ -2177,7 +2177,7 @@ void TEWidget::setFixedSize(int cols, int lins)
   TQFrame::setFixedSize(m_size);
 }
 
-TQSize TEWidget::tqsizeHint() const
+TQSize TEWidget::sizeHint() const
 {
   return m_size;
 }
@@ -2242,7 +2242,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
         TQString tmp;
         if (url.isLocalFile()) {
           tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others
-        } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) {
+        } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) {
 	  justPaste = true;
 	  break;
 	} else {
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index afb1ff3a8..197ec860c 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -98,7 +98,7 @@ public:
     void updateImageSize();
     void setSize(int cols, int lins);
     void setFixedSize(int cols, int lins);
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     void setWordCharacters(TQString wc);
     TQString wordCharacters() { return word_characters; }
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index b3aa76e9f..18d453a58 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -362,7 +362,7 @@ void KeyTrans::readConfig()
 ;
       TQBuffer* newbuf;
       newbuf = new TQBuffer();
-      newbuf->tqsetBufferFromCopy(txt);
+      newbuf->setBuffer(txt);
       buf=TQT_TQIODEVICE(newbuf);
    }
    else
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 2af5da9ea..0d464417c 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -1289,7 +1289,7 @@ void Konsole::setColLin(int columns, int lines)
        te->setSize(columns, lines);
     adjustSize();
     if (b_fixedSize)
-      setFixedSize(tqsizeHint());
+      setFixedSize(sizeHint());
     notifySize(columns, lines);  // set menu items
   }
 }
@@ -1437,7 +1437,7 @@ void Konsole::slotSaveSessionsProfile()
       TQString::null, &ok, this );
   if ( ok ) {
     TQString path = locateLocal( "data",
-        TQString::tqfromLatin1( "konsole/profiles/" ) + prof,
+        TQString::fromLatin1( "konsole/profiles/" ) + prof,
         KGlobal::instance() );
 
     if ( TQFile::exists( path ) )
@@ -1927,7 +1927,7 @@ void Konsole::slotToggleMenubar() {
   if (b_fixedSize)
   {
      adjustSize();
-     setFixedSize(tqsizeHint());
+     setFixedSize(sizeHint());
   }
   if (!showMenubar->isChecked()) {
     setCaption(i18n("Use the right mouse button to bring back the menu"));
@@ -2007,7 +2007,7 @@ void Konsole::slotSelectTabbar() {
   if (b_fixedSize)
   {
      adjustSize();
-     setFixedSize(tqsizeHint());
+     setFixedSize(sizeHint());
   }
 }
 
@@ -3498,7 +3498,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
   co->writeEntry("Name", socket);
   TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
   co->writeEntry("Comment", txt);
-  co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2")
+  co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2")
     .arg(path).arg(socket));
   TQString icon = "konsole";
   cmd_serial++;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index b5463f8fb..d7f871f8d 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -1137,7 +1137,7 @@ void konsolePart::showShellInDir( const TQString& dir )
   {
       TQString text = dir;
       KRun::shellQuote(text);
-      text = TQString::tqfromLatin1("cd ") + text + '\n';
+      text = TQString::fromLatin1("cd ") + text + '\n';
       te->emitText( text );
   };
 }
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 1f40e8c14..cb21f6aff 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -271,7 +271,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
 
   TQString term = "";
   if(args->isSet("tn")) {
-    term=TQString::tqfromLatin1(args->getOption("tn"));
+    term=TQString::fromLatin1(args->getOption("tn"));
   }
   login_shell = args->isSet("ls");
 
@@ -591,7 +591,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
  //// Temporary code, waiting for Qt to do this properly
 
   // Delete all toplevel widgets that have WDestructiveClose
-  TQWidgetList *list = TQApplication::tqtopLevelWidgets();
+  TQWidgetList *list = TQApplication::topLevelWidgets();
   // remove all toplevel widgets that have a parent (i.e. they
   // got WTopLevel explicitly), they'll be deleted by the parent
   list->first();
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index b3bae8eff..f18b7cfc5 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname)
 ,lastRead(new TQDateTime())
 {
   //start with a valid time, aleXXX
-  *lastRead = TQDateTime::tqcurrentDateTime();
+  *lastRead = TQDateTime::currentDateTime();
   TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname);
   if (fPath.isEmpty() || !TQFile::exists(fPath))
   {
@@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile()
 
   char line[100];
 
-  *lastRead = TQDateTime::tqcurrentDateTime();
+  *lastRead = TQDateTime::currentDateTime();
 
   while (fscanf(sysin,"%80[^\n]\n",line) > 0)
   {
@@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas()
   // now.
   //
   //
-  TQDateTime now = TQDateTime::tqcurrentDateTime();
+  TQDateTime now = TQDateTime::currentDateTime();
 
 
   r = updateAllSchemaTimes(now);
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index cc4293326..53990af2f 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -133,11 +133,11 @@ void TESession::ptyError()
 {
   // FIXME:  sh->error() is always empty
   if ( sh->error().isEmpty() )
-    KMessageBox::error( te->tqtopLevelWidget(),
+    KMessageBox::error( te->topLevelWidget(),
        i18n("Konsole is unable to open a PTY (pseudo teletype).  It is likely that this is due to an incorrect configuration of the PTY devices.  Konsole needs to have read/write access to the PTY devices."), 
        i18n("A Fatal Error Has Occurred") );
   else
-    KMessageBox::error(te->tqtopLevelWidget(), sh->error());
+    KMessageBox::error(te->topLevelWidget(), sh->error());
   emit done(this);
 }
 
@@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
   connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
   connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
 
-  zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false,
+  zmodemProgress = new ZModemDialog(te->topLevelWidget(), false,
                                     i18n("ZModem Progress"));
 
   connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
@@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic()
 void TESession::onRcvBlock( const char* buf, int len )
 {
     em->onRcvBlock( buf, len );
-    emit receivedData( TQString::tqfromLatin1( buf, len ) );
+    emit receivedData( TQString::fromLatin1( buf, len ) );
 }
 
 void TESession::print( TQPainter &paint, bool friendly, bool exact )