Remove additional unneeded tq method conversions

(cherry picked from commit 7ea89afa119615e547323a7a482ea7fef8e67029)

15 files changed, 42 insertions, 42 deletions

diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp
index 9379201..7cf6d73 100644
--- a/superkaramba/src/imagelabel_python.cpp
+++ b/superkaramba/src/imagelabel_python.cpp
@@ -61,7 +61,7 @@ ImageLabel* createImageLabel(karamba *theme, long x, long y,
   theme->meterList->append (tmp);
   theme->imageList->append (tmp);
   if(bg)
-    theme->kroot->tqrepaint(true);
+    theme->kroot->repaint(true);
   return tmp;
 }
 
diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp
index 2769ed2..eae8780 100644
--- a/superkaramba/src/input.cpp
+++ b/superkaramba/src/input.cpp
@@ -35,7 +35,7 @@ Input::~Input()
 
 void Input::mUpdate(TQPainter*)
 {
-  edit->tqrepaint();
+  edit->repaint();
 }
 
 void Input::setValue(TQString text)
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 0fa16da..a6b1e5f 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -85,7 +85,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   karambaApp->addKaramba(this, reloading);
 
   if(prettyName.isEmpty())
-    prettyName = TQString("%1 - %2").tqarg(m_theme.name()).tqarg(m_instance);
+    prettyName = TQString("%1 - %2").arg(m_theme.name()).arg(m_instance);
 
   kdDebug() << "Starting theme: " << m_theme.name()
             << " pretty name: " << prettyName << endl;
@@ -111,7 +111,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   // Creates KConfig Object
   TQString instanceString;
   if(m_instance > 1)
-    instanceString = TQString("-%1").tqarg(m_instance);
+    instanceString = TQString("-%1").arg(m_instance);
   TQString cfg = TQDir::home().absPath() + "/.superkaramba/"
       + m_theme.id() + instanceString + ".rc";
   kdDebug() << cfg << endl;
@@ -1619,13 +1619,13 @@ void karamba::updateBackground(KSharedPixmap* kpm)
   {
     systray->updateBackgroundPixmap(buffer2);
   }
-  tqrepaint();
+  repaint();
 }
 
 void karamba::currentDesktopChanged( int i )
 {
   //qDebug("karamba::currentDesktopChanged");
-  kroot->tqrepaint( true );
+  kroot->repaint( true );
   if (pythonIface && pythonIface->isExtensionLoaded())
     pythonIface->desktopChanged(this, i);
 }
@@ -1633,7 +1633,7 @@ void karamba::currentDesktopChanged( int i )
 void karamba::currentWallpaperChanged(int i )
 {
   //qDebug("karamba::currentWallpaperChanged");
-  kroot->tqrepaint( true );
+  kroot->repaint( true );
   if (pythonIface && pythonIface->isExtensionLoaded())
     pythonIface->wallpaperChanged(this, i);
 }
@@ -1660,7 +1660,7 @@ void karamba::externalStep()
     p.end();
 
     bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP);
-    tqrepaint();
+    repaint();
   }
 }
 
diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp
index 1538672..99b901b 100644
--- a/superkaramba/src/karamba_python.cpp
+++ b/superkaramba/src/karamba_python.cpp
@@ -125,8 +125,8 @@ static PyMethodDef karamba_methods[] = {
     {(char*)"getTextColor", py_getTextColor, METH_VARARGS, (char*)"Get a Text Sensor's Color"},
     {(char*)"changeTextSize", py_setTextFontSize, METH_VARARGS, (char*)"Change a Text Sensor's Font Size"},
     {(char*)"getTextFontSize", py_getTextFontSize, METH_VARARGS, (char*)"Get a Text Sensor's Font Size"},
-    {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text tqalignment."},
-    {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text tqalignment."},
+    {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text alignment."},
+    {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text alignment."},
     {(char*)"setTextScroll", py_setTextScroll, METH_VARARGS, (char*)"Set Text scroll."},
 
     // RichTextLabel - richtextlabel_python.cpp
diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp
index 40b6d3e..57b9db0 100644
--- a/superkaramba/src/sklineedit.cpp
+++ b/superkaramba/src/sklineedit.cpp
@@ -46,13 +46,13 @@ void SKLineEdit::drawContents(TQPainter *p)
 void SKLineEdit::setFrameColor(TQColor c)
 {
   frameColor = c;
-  tqrepaint();
+  repaint();
 }
 
 void SKLineEdit::setBackgroundColor(TQColor c)
 {
   TQLineEdit::setBackgroundColor(c);
-  tqrepaint();
+  repaint();
 }
 
 TQColor SKLineEdit::getFrameColor() const
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index fbd4625..0332edd 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -190,7 +190,7 @@ void Systemtray::layoutSystray()
     }
 
     count++;
-    emb->tqrepaint();
+    emb->repaint();
   }
 }
 
diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp
index 2c10659..4b1cee2 100644
--- a/superkaramba/src/textfield.cpp
+++ b/superkaramba/src/textfield.cpp
@@ -106,28 +106,28 @@ void TextField::setAlignment( const TQString &align )
 {
     TQString a = align.upper();
     if( a == "LEFT" || a.isEmpty() )
-        tqalignment = TQt::AlignLeft;
+        alignment = TQt::AlignLeft;
     if( a == "RIGHT" )
-        tqalignment = TQt::AlignRight;
+        alignment = TQt::AlignRight;
     if( a == "CENTER" )
-        tqalignment = TQt::AlignHCenter;
+        alignment = TQt::AlignHCenter;
 }
 
 void TextField::setAlignment( int af )
 {
-    tqalignment = af;
+    alignment = af;
 }
 
 int TextField::getAlignment() const
 {
-    return tqalignment;
+    return alignment;
 }
 
 TQString TextField::getAlignmentAsString() const
 {
-    if( tqalignment == TQt::AlignHCenter )
+    if( alignment == TQt::AlignHCenter )
         return "CENTER";
-    else if( tqalignment == TQt::AlignRight )
+    else if( alignment == TQt::AlignRight )
         return "RIGHT";
     else
         return "LEFT";
diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h
index 111f053..13177b7 100644
--- a/superkaramba/src/textfield.h
+++ b/superkaramba/src/textfield.h
@@ -47,7 +47,7 @@ public:
     int getLineHeight() const;
 
 protected:
-    int tqalignment;
+    int alignment;
     TQFont font;
     TQColor color;
     TQColor bgColor;
diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp
index a33ea97..09b8f98 100644
--- a/superkaramba/src/textlabel.cpp
+++ b/superkaramba/src/textlabel.cpp
@@ -13,7 +13,7 @@
 #include "textlabel.h"
 
 TextLabel::TextLabel(karamba *k, int x,int y,int w,int h):
-  Meter(k, x,y,w,h), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
+  Meter(k, x,y,w,h), alignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
   lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0),
   scrollPause(0), pauseCounter(0), scrollType(ScrollNone)
 {
@@ -31,7 +31,7 @@ TextLabel::TextLabel(karamba *k, int x,int y,int w,int h):
 }
 
 TextLabel::TextLabel(karamba *k):
-  Meter(k, 0, 0, 0, 0), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
+  Meter(k, 0, 0, 0, 0), alignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0),
   lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0),
   scrollPause(0), pauseCounter(0), scrollType(ScrollNone)
 {
@@ -60,7 +60,7 @@ void TextLabel::setTextProps( TextField* t )
     text = *t;
     //lineHeight = t->getLineHeight();
     shadow = t->getShadow();
-    tqalignment = t->getAlignment();
+    alignment = t->getAlignment();
     setFontSize(t->getFontSize());
     setFont(t->getFont());
 
@@ -135,18 +135,18 @@ void TextLabel::setAlignment( TQString align )
 {
     TQString a = align.upper();
     if( a == "LEFT" || a.isEmpty() )
-        tqalignment = TQt::AlignLeft;
+        alignment = TQt::AlignLeft;
     if( a == "RIGHT" )
-        tqalignment = TQt::AlignRight;
+        alignment = TQt::AlignRight;
     if( a == "CENTER" )
-        tqalignment = TQt::AlignHCenter;
+        alignment = TQt::AlignHCenter;
 }
 
 TQString TextLabel::getAlignment() const
 {
-    if( tqalignment == TQt::AlignHCenter )
+    if( alignment == TQt::AlignHCenter )
         return "CENTER";
-    else if( tqalignment == TQt::AlignRight )
+    else if( alignment == TQt::AlignRight )
         return "RIGHT";
     else
         return "LEFT";
@@ -228,10 +228,10 @@ int TextLabel::drawText(TQPainter *p, int x, int y, int width, int height,
   {
     p->setPen(getBGColor());
     p->drawText(x + shadow, y + shadow, width, height,
-                tqalignment | clip | TQt::ExpandTabs, text);
+                alignment | clip | TQt::ExpandTabs, text);
   }
   p->setPen(getColor());
-  p->drawText(x, y, width, height, tqalignment | clip | TQt::ExpandTabs, text);
+  p->drawText(x, y, width, height, alignment | clip | TQt::ExpandTabs, text);
   return 0;
 }
 
diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h
index b3579e1..72fcbc9 100644
--- a/superkaramba/src/textlabel.h
+++ b/superkaramba/src/textlabel.h
@@ -62,7 +62,7 @@ public:
     virtual bool click(TQMouseEvent*);
 
 private:
-    int tqalignment;
+    int alignment;
     int clip;
     TQStringList value;
     TQFont font;
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index 0e420d2..0e8c02f 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -213,7 +213,7 @@ bool ThemeFile::set(const KURL &url)
        i18n("You are about to install and run %1 SuperKaramba theme. Since "
             "themes can contain executable code you should only install themes "
             "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install")
-           .tqarg(url.prettyURL()))
+           .arg(url.prettyURL()))
        == KMessageBox::Cancel)
     {
       return false;
@@ -226,7 +226,7 @@ bool ThemeFile::set(const KURL &url)
     {
       if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()),
          i18n("%1 already exists. Do you want to overwrite it?")
-             .tqarg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
+             .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
          == KMessageBox::Cancel)
       {
         return false;
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index bc388c2..37c72b7 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -157,7 +157,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages)
       ++it)
   {
     TQString file =
-        TQString("locale/%1/LC_MESSAGES/%2.mo").tqarg(*it).tqarg(m_theme->mo());
+        TQString("locale/%1/LC_MESSAGES/%2.mo").arg(*it).arg(m_theme->mo());
 
     if(m_theme->fileExists(file))
     {
diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp
index 3addd2a..cad020c 100644
--- a/superkaramba/src/themewidget.cpp
+++ b/superkaramba/src/themewidget.cpp
@@ -75,7 +75,7 @@ void ThemeWidget::updateRunning()
 {
   int i = instances();
   if(i > 0)
-    running->setText(i18n("<p align=\"center\">%1 running</p>").tqarg(i));
+    running->setText(i18n("<p align=\"center\">%1 running</p>").arg(i));
   else
     running->setText("");
 }
@@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show)
 
 void ThemeWidget::setDescriptionMaxHeight()
 {
-  if(layoutText->tqgeometry().height() <= 0)
+  if(layoutText->geometry().height() <= 0)
     return;
-  int height = layoutText->tqgeometry().height() - themeName->height() -
+  int height = layoutText->geometry().height() - themeName->height() -
                layoutText->spacing();
   if(buttonGo->isVisible())
-    height -= layoutButton->tqgeometry().height() + layoutText->spacing();
+    height -= layoutButton->geometry().height() + layoutText->spacing();
   description->setMaximumHeight(height);
 }
 
diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui
index 0159820..6e07e26 100644
--- a/superkaramba/src/themewidget_layout.ui
+++ b/superkaramba/src/themewidget_layout.ui
@@ -47,7 +47,7 @@
                     <property name="pixmap">
                         <pixmap>image0</pixmap>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -121,7 +121,7 @@
                     <property name="text">
                         <string>Description</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp
index 564b4b4..0948e39 100644
--- a/superkaramba/src/widget_python.cpp
+++ b/superkaramba/src/widget_python.cpp
@@ -101,7 +101,7 @@ PyObject* py_create_widget_mask(PyObject *, PyObject *args)
 long redrawWidgetBackground(long widget)
 {
   karamba* currTheme = (karamba*)widget;
-  currTheme->kroot->tqrepaint(true);
+  currTheme->kroot->repaint(true);
   return 1;
 }