Remove additional unneeded tq method conversions

(cherry picked from commit f64397c82fa94371ab4a64af28c4d0029f4cd93f)

8 files changed, 54 insertions, 54 deletions

diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes
index 2f0554a0b..6ece0f4bf 100644
--- a/konsole/doc/VT100/Table.Codes
+++ b/konsole/doc/VT100/Table.Codes
@@ -1070,7 +1070,7 @@ DECALN.sect Command
 DECALN.code HSH|8|
 DECALN.text
   Causes the VT100 to fill it's screen with
-  uppercase Es for screen focus and tqalignment.
+  uppercase Es for screen focus and alignment.
 DECALN.table.XPS
   Subcode|Emulation|Scope|Operation|Args|Meaning
   N/A|VT100|scr|helpAlign||see above
diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html
index 6b39bda55..6e36f39e5 100644
--- a/konsole/doc/VT100/techref.html
+++ b/konsole/doc/VT100/techref.html
@@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue.
 <tr><td><p></td>
 <tr><td></td>
     <td  colspan=6>  Causes the VT100 to fill it's screen with
-  uppercase Es for screen focus and tqalignment.
+  uppercase Es for screen focus and alignment.
 <tr><td><p></td></tr>
 <tr>
 <td></td>
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index 7af02c247..e6355a90e 100644
--- a/konsole/konsole/TEScreen.cpp
+++ b/konsole/konsole/TEScreen.cpp
@@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen()
 }
 
 /*! fill screen with 'E'
-    This is to aid screen tqalignment
+    This is to aid screen alignment
 */
 
 void TEScreen::helpAlign()
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 31d4f5f82..73aa29fee 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -564,7 +564,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
   int w;
   for(unsigned int i=0;i<str.length();i++)
   {
-    drawstr = str.tqat(i);
+    drawstr = str.at(i);
     // Add double of the width if next c is 0;
     if ((attr+nc+1)->c) // This may access image[image_size] See makeImage()
     {
@@ -1072,7 +1072,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
      pm.fill();
 
      TQPainter pm_paint;
-     pm_paint.tqbegin(&pm, TQT_TQWIDGET(this));
+     pm_paint.begin(&pm, TQT_TQWIDGET(this));
      paintContents(pm_paint, contentsRect(), true);
      pm_paint.end();
      paint.drawPixmap(0, 0, pm);
@@ -1159,14 +1159,14 @@ void TEWidget::blinkEvent()
 {
   blinking = !blinking;
   isBlinkEvent = true;
-  tqrepaint(false);
+  repaint(false);
   isBlinkEvent = false;
 }
 
 void TEWidget::blinkCursorEvent()
 {
   cursorBlinking = !cursorBlinking;
-  tqrepaint(cursorRect, true);
+  repaint(cursorRect, true);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1742,14 +1742,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev)
 
 void TEWidget::focusInEvent( TQFocusEvent * )
 {
-  tqrepaint(cursorRect, true);  // *do* erase area, to get rid of the
+  repaint(cursorRect, true);  // *do* erase area, to get rid of the
                               // hollow cursor rectangle.
 }
 
 
 void TEWidget::focusOutEvent( TQFocusEvent * )
 {
-  tqrepaint(cursorRect, true);  // don't erase area
+  repaint(cursorRect, true);  // don't erase area
 }
 
 bool TEWidget::focusNextPrevChild( bool next )
@@ -1860,7 +1860,7 @@ void TEWidget::onClearSelection()
 
 //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent'
 //       due to a bug in `QT' or the ignorance of the author to prevent
-//       tqrepaint events being emitted to the screen whenever one leaves
+//       repaint events being emitted to the screen whenever one leaves
 //       or reenters the screen to/from another application.
 //
 //   Troll says one needs to change focusInEvent() and focusOutEvent(),
@@ -1984,7 +1984,7 @@ void TEWidget::imEndEvent( TQIMEvent *e )
   m_imPreeditLength = 0;
 
   m_isIMEdit = m_isIMSel = false;
-  tqrepaint( repaintRect, true );
+  repaint( repaintRect, true );
 }
 
 // Override any Ctrl+<key> accelerator when pressed with the keyboard
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 0d464417c..b824c4b4e 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -1158,7 +1158,7 @@ void Konsole::makeBasicGUI()
               TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
 
   for (int i=1;i<13;i++) { // Due to 12 function keys?
-     new KAction(i18n("Switch to Session %1").tqarg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
+     new KAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
   }
 
   new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
@@ -1313,7 +1313,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos)
    if (!m_menuCreated)
       makeGUI();
 
-  m_contextMenuSession = sessions.tqat( tabwidget->indexOf( _te ) );
+  m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) );
 
   m_tabDetachSession->setEnabled( tabwidget->count()>1 );
 
@@ -1384,12 +1384,12 @@ void Konsole::slotTabSetViewOptions(int mode)
   for(int i = 0; i < tabwidget->count(); i++) {
 
     TQWidget *page = tabwidget->page(i);
-    TQIconSet icon = iconSetForSession(sessions.tqat(i));
+    TQIconSet icon = iconSetForSession(sessions.at(i));
     TQString title;
     if (b_matchTabWinTitle)
-      title = sessions.tqat(i)->fullTitle();
+      title = sessions.at(i)->fullTitle();
     else
-      title = sessions.tqat(i)->Title();
+      title = sessions.at(i)->Title();
 
     title=title.replace('&',"&&");
     switch(mode) {
@@ -1622,7 +1622,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
       ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
       if (!sch)
       {
-         sch = (ColorSchema*)colors->tqat(0);  //the default one
+         sch = (ColorSchema*)colors->at(0);  //the default one
          kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
          s_kconfigSchema = sch->relPath();
       }
@@ -1650,7 +1650,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
              delete rootxpms[te];
              rootxpms.remove(te);
            }
-           pixmap_menu_activated(sch->tqalignment());
+           pixmap_menu_activated(sch->alignment());
         }
 
         te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug
@@ -1886,7 +1886,7 @@ void Konsole::updateSchemaMenu()
   m_schema->clear();
   for (int i = 0; i < (int) colors->count(); i++)
   {
-     ColorSchema* s = (ColorSchema*)colors->tqat(i);
+     ColorSchema* s = (ColorSchema*)colors->at(i);
     assert( s );
     TQString title=s->title();
     m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
@@ -2002,7 +2002,7 @@ void Konsole::slotSelectTabbar() {
 /* FIXME: Still necessary ? */
       TQPtrDictIterator<KRootPixmap> it(rootxpms);
       for (;it.current();++it)
-        it.current()->tqrepaint(true);
+        it.current()->repaint(true);
 
   if (b_fixedSize)
   {
@@ -2129,7 +2129,7 @@ void Konsole::reparseConfiguration()
   ColorSchema* sch = colors->find(s_kconfigSchema);
   if (!sch)
   {
-     sch = (ColorSchema*)colors->tqat(0);  //the default one
+     sch = (ColorSchema*)colors->at(0);  //the default one
      kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
      s_kconfigSchema = sch->relPath();
   }
@@ -2500,7 +2500,7 @@ TQString Konsole::sessionId(const int position)
   if (position<=0 || position>(int)sessions.count())
     return "";
 
-  return sessions.tqat(position-1)->SessionId();
+  return sessions.at(position-1)->SessionId();
 }
 
 void Konsole::listSessions()
@@ -2526,7 +2526,7 @@ void Konsole::activateSession(int position)
 {
   if (position<0 || position>=(int)sessions.count())
     return;
-  activateSession( sessions.tqat(position) );
+  activateSession( sessions.at(position) );
 }
 
 void Konsole::activateSession(TQWidget* w)
@@ -2586,11 +2586,11 @@ void Konsole::activateSession(TESession *s)
   // Set the required schema variables for the current session
   ColorSchema* cs = colors->find( se->schemaNo() );
   if (!cs)
-      cs = (ColorSchema*)colors->tqat(0);  //the default one
+      cs = (ColorSchema*)colors->at(0);  //the default one
   s_schema = cs->relPath();
   curr_schema = cs->numb();
   pmPath = cs->imagePath();
-  n_render = cs->tqalignment();
+  n_render = cs->alignment();
 
 // BR 106464 temporary fix... 
 //  only 2 sessions opened, 2nd session viewable, right-click on 1st tab and 
@@ -2632,7 +2632,7 @@ void Konsole::activateSession(TESession *s)
   if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() );
   masterMode->setChecked( se->isMasterMode() );
   sessions.find(se);
-  uint position=sessions.tqat();
+  uint position=sessions.at();
   if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0);
   if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1);
 }
@@ -2871,7 +2871,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
 
   ColorSchema* schema = colors->find(sch);
   if (!schema)
-      schema=(ColorSchema*)colors->tqat(0);  //the default one
+      schema=(ColorSchema*)colors->at(0);  //the default one
   int schmno = schema->numb();
 
   if (sessions.count()==1 && n_tabbar!=TabNone)
@@ -3063,7 +3063,7 @@ void Konsole::doneSession(TESession* s)
     se = 0;
     if (sessions.count())
     {
-      se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0);
+      se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
 
       session2action.find(se)->setChecked(true);
       //FIXME: this Timer stupidity originated from the connected
@@ -3081,7 +3081,7 @@ void Konsole::doneSession(TESession* s)
   }
   else {
     sessions.find(se);
-    uint position=sessions.tqat();
+    uint position=sessions.at();
     m_moveSessionLeft->setEnabled(position>0);
     m_moveSessionRight->setEnabled(position<sessions.count()-1);
   }
@@ -3135,7 +3135,7 @@ void Konsole::slotMovedTab(int from, int to)
 void Konsole::moveSessionLeft()
 {
   sessions.find(se);
-  uint position=sessions.tqat();
+  uint position=sessions.at();
   if (position==0)
     return;
 
@@ -3167,7 +3167,7 @@ void Konsole::moveSessionLeft()
 void Konsole::moveSessionRight()
 {
   sessions.find(se);
-  uint position=sessions.tqat();
+  uint position=sessions.at();
 
   if (position==sessions.count()-1)
     return;
@@ -3570,7 +3570,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget)
   ColorSchema* s = colors->find(numb);
   if (!s)
   {
-    s = (ColorSchema*)colors->tqat(0);
+    s = (ColorSchema*)colors->at(0);
     kdWarning() << "No schema with serial #"<<numb<<", using "<<s->relPath()<<" (#"<<s->numb()<<")." << endl;
     s_kconfigSchema = s->relPath();
   }
@@ -3587,7 +3587,7 @@ void Konsole::setSchema(const TQString & path)
   ColorSchema* s = colors->find(path);
   if (!s)
   {
-     s = (ColorSchema*)colors->tqat(0);  //the default one
+     s = (ColorSchema*)colors->at(0);  //the default one
      kdWarning() << "No schema with the name " <<path<<", using "<<s->relPath()<<endl;
      s_kconfigSchema = s->relPath();
   }
@@ -3639,7 +3639,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget)
         delete rootxpms[tewidget];
         rootxpms.remove(tewidget);
       }
-       pixmap_menu_activated(s->tqalignment(), tewidget);
+       pixmap_menu_activated(s->alignment(), tewidget);
        tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff));
   }
 
@@ -3718,7 +3718,7 @@ void Konsole::detachSession(TESession* _se) {
     if (se_previous)
       se = se_previous;
     else
-      se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0);
+      se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
     session2action.find(se)->setChecked(true);
     TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
   }
@@ -3992,7 +3992,7 @@ void Konsole::slotOpenSelection()
 
   m_filterData = new KURIFilterData( selectedURL );
   KURIFilter::self()->filterURI( *(m_filterData) );
-  m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).tqarg(m_filterData->uri().url()), 1 );
+  m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 );
 
   connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int)));
 }
@@ -4207,7 +4207,7 @@ void Konsole::toggleBidi()
   TQPtrList<TEWidget> tes = activeTEs();
   for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
     _te->setBidiEnabled(b_bidiEnabled);
-    _te->tqrepaint();
+    _te->repaint();
   }
 }
 
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index d7f871f8d..1054ce826 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -577,7 +577,7 @@ void konsolePart::readProperties()
   s_kconfigSchema=config->readEntry("schema");
   ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
   if (!sch) {
-    sch=(ColorSchema*)colors->tqat(0);  //the default one
+    sch=(ColorSchema*)colors->at(0);  //the default one
   }
   if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile();
   s_schema = sch->relPath();
@@ -591,7 +591,7 @@ void konsolePart::readProperties()
         rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
       rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
       rootxpm->start();
-      rootxpm->tqrepaint(true);
+      rootxpm->repaint(true);
     }
     else {
       te->setBlendColor(tqRgba(sch->tr_r(), sch->tr_g(), sch->tr_b(), int(sch->tr_x() * 255)));
@@ -604,7 +604,7 @@ void konsolePart::readProperties()
       delete rootxpm;
       rootxpm=0;
     }
-    pixmap_menu_activated(sch->tqalignment());
+    pixmap_menu_activated(sch->alignment());
   }
 
   te->setBellMode(n_bell);
@@ -737,7 +737,7 @@ void konsolePart::updateSchemaMenu()
 
   m_schema->clear();
   for (int i = 0; i < (int) colors->count(); i++)  {
-    ColorSchema* s = (ColorSchema*)colors->tqat(i);
+    ColorSchema* s = (ColorSchema*)colors->at(i);
     TQString title=s->title();
     m_schema->insertItem(title.replace('&',"&&"),s->numb(),0);
   }
@@ -752,7 +752,7 @@ void konsolePart::setSchema(int numb)
   ColorSchema* s = colors->find(numb);
   if (!s) {
     kdWarning() << "No schema found. Using default." << endl;
-    s=(ColorSchema*)colors->tqat(0);
+    s=(ColorSchema*)colors->at(0);
   }
   if (s->numb() != numb)  {
     kdWarning() << "No schema with number " << numb << endl;
@@ -785,7 +785,7 @@ void konsolePart::setSchema(ColorSchema* s)
         rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
       rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
       rootxpm->start();
-      rootxpm->tqrepaint(true);
+      rootxpm->repaint(true);
     }
     else {
       te->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255)));
@@ -798,7 +798,7 @@ void konsolePart::setSchema(ColorSchema* s)
       delete rootxpm;
       rootxpm=0;
     }
-    pixmap_menu_activated(s->tqalignment());
+    pixmap_menu_activated(s->alignment());
   }
 
   te->setColorTable(s->table());
@@ -809,8 +809,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */)
 {
   ColorSchema *sch=colors->find(s_schema);
 
-  if (sch && sch->tqalignment() >= 3)
-    pixmap_menu_activated(sch->tqalignment());
+  if (sch && sch->alignment() >= 3)
+    pixmap_menu_activated(sch->alignment());
 }
 
 void konsolePart::pixmap_menu_activated(int item)
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index f18b7cfc5..eaf2ea7a8 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c)
 
   m_title = c.readEntry("Title",i18n("[no title]"));
   m_imagePath = c.readEntry("ImagePath");
-  m_tqalignment = c.readNumEntry("ImageAlignment",1);
+  m_alignment = c.readNumEntry("ImageAlignment",1);
   m_useTransparency = c.readBoolEntry("UseTransparency",false);
 
   m_tr_r = c.readNumEntry("TransparentR",0);
@@ -203,7 +203,7 @@ void ColorSchema::clearSchema()
   }
   m_title     = i18n("[no title]");
   m_imagePath = "";
-  m_tqalignment = 1;
+  m_alignment = 1;
   m_useTransparency = false;
   m_tr_x = 0.0;
   m_tr_r = 0;
@@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema()
   m_numb = 0;
   m_title = i18n("Konsole Default");
   m_imagePath = ""; // background pixmap
-  m_tqalignment = 1;  // none
+  m_alignment = 1;  // none
   m_useTransparency = false; // not use pseudo-transparency by default
   m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side
   m_tr_x = 0.0;
@@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const
   c.setGroup("SchemaGeneral");
   c.writeEntry("Title",m_title);
   c.writeEntry("ImagePath",m_imagePath);
-  c.writeEntry("ImageAlignment",m_tqalignment);
+  c.writeEntry("ImageAlignment",m_alignment);
   c.writeEntry("UseTransparency",m_useTransparency);
 
   c.writeEntry("TransparentR",m_tr_r);
@@ -334,7 +334,7 @@ bool ColorSchema::rereadSchemaFile()
 
         TQString qline(line);
         m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) );
-        m_tqalignment = attr;
+        m_alignment = attr;
       }
       if (!strncmp(line,"transparency",12))
       { float rx;
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 1027a6c9e..fa9f32412 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -150,7 +150,7 @@ protected:
       int numb()                       {if (!m_fileRead) rereadSchemaFile();return m_numb;};
       const TQString& title()           {if (!m_fileRead) rereadSchemaFile();return m_title;};
       const TQString& imagePath()       {if (!m_fileRead) rereadSchemaFile();return m_imagePath;};
-      int tqalignment()                  {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;};
+      int alignment()                  {if (!m_fileRead) rereadSchemaFile();return m_alignment;};
       const ColorEntry* table()        {if (!m_fileRead) rereadSchemaFile();return m_table;};
       bool useTransparency()           {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;};
       double tr_x()                    {if (!m_fileRead) rereadSchemaFile();return m_tr_x;};
@@ -162,7 +162,7 @@ protected:
    private:
       int        m_numb;
       int	     m_tr_r, m_tr_g, m_tr_b;
-      int        m_tqalignment;
+      int        m_alignment;
       TQString    m_title;
       TQString    m_imagePath;
       ColorEntry m_table[TABLE_COLORS];
@@ -188,7 +188,7 @@ public:
 	const ColorSchema *at(unsigned int i)
 		{ return TQPtrList<ColorSchema>::at(i); } ;
 #ifdef USE_QT4
-	const ColorSchema *tqat(unsigned int i)
+	const ColorSchema *at(unsigned int i)
 		{ return at(i); } ;
 #endif // USE_QT4