Rename old tq methods that no longer need a unique name

17 files changed, 38 insertions, 38 deletions

diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 56c9d31..ca5e6e6 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -20,7 +20,7 @@ DateSensor::~DateSensor()
 
 void DateSensor::update()
 {
-    TQDateTime qdt  =  TQDateTime::tqcurrentDateTime();
+    TQDateTime qdt  =  TQDateTime::currentDateTime();
     TQString format;
     SensorParams *sp;
     Meter *meter;
@@ -90,8 +90,8 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev)
 				connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
 				TQPoint c = (TQPoint(ev->x(), ev->y()));
 
-				int w = cal->tqsizeHint().width();
-				int h = cal->tqsizeHint().height();
+				int w = cal->sizeHint().width();
+				int h = cal->sizeHint().height();
 
 				// make calendar fully visible
 				 TQRect deskR = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(c));
diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp
index 63290cc..2769ed2 100644
--- a/superkaramba/src/input.cpp
+++ b/superkaramba/src/input.cpp
@@ -131,7 +131,7 @@ void Input::setFontColor(TQColor fontColor)
 
 TQColor Input::getFontColor() const
 {
-  const TQColorGroup &color = edit->tqcolorGroup();
+  const TQColorGroup &color = edit->colorGroup();
   return color.text();
 }
 
@@ -144,7 +144,7 @@ void Input::setSelectionColor(TQColor selectionColor)
 
 TQColor Input::getSelectionColor() const
 {
-  const TQColorGroup &color = edit->tqcolorGroup();
+  const TQColorGroup &color = edit->colorGroup();
   return color.highlight();
 }
 
@@ -157,7 +157,7 @@ void Input::setSelectedTextColor(TQColor selectedTextColor)
 
 TQColor Input::getSelectedTextColor() const
 {
-  const TQColorGroup &color = edit->tqcolorGroup();
+  const TQColorGroup &color = edit->colorGroup();
   return color.highlightedText();
 }
 
diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp
index 82ed00f..fb451bd 100644
--- a/superkaramba/src/input_python.cpp
+++ b/superkaramba/src/input_python.cpp
@@ -346,7 +346,7 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args)
   // FocusWidget() returns the currently focused line edit,
   // but unfortunately we need an 'Input' object here.
   //
-  TQWidget *obj = ((karamba*)widget)->tqfocusWidget();
+  TQWidget *obj = ((karamba*)widget)->focusWidget();
   
   if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit
     return Py_BuildValue((char*)"l", ((SKLineEdit*)obj)->getInput());
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 90c58c0..da5d1c9 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -622,7 +622,7 @@ bool karamba::parseConfig()
                                      TQColor("white")));
         defaultTextField->setFont(lineParser.getString("FONT", "Helvetica"));
         defaultTextField->setFontSize(lineParser.getInt("FONTSIZE", 12));
-        defaultTextField->tqsetAlignment(lineParser.getString("ALIGN",
+        defaultTextField->setAlignment(lineParser.getString("ALIGN",
                                        "LEFT"));
         defaultTextField->setFixedPitch(lineParser.getBoolean("FIXEDPITCH",
                                         false));
@@ -647,7 +647,7 @@ bool karamba::parseConfig()
         tmpText->setFont(lineParser.getString("FONT", defTxt.getFont()));
         tmpText->setFontSize(lineParser.getInt("FONTSIZE",
                              defTxt.getFontSize()));
-        tmpText->tqsetAlignment(lineParser.getString("ALIGN",
+        tmpText->setAlignment(lineParser.getString("ALIGN",
                               defTxt.getAlignmentAsString()));
         tmpText->setFixedPitch(lineParser.getInt("FIXEDPITCH",
                                defTxt.getFixedPitch()));
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 87f6e60..f3231b2 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -76,7 +76,7 @@ TQString KarambaApplication::getMainKaramba()
 
 bool KarambaApplication::themeExists(TQString pretty_name)
 {
-  TQWidgetList  *list = TQApplication::tqallWidgets();
+  TQWidgetList  *list = TQApplication::allWidgets();
   TQWidgetListIt it( *list );         // iterate over the widgets
   TQWidget * w;
   while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/karambainterface.cpp b/superkaramba/src/karambainterface.cpp
index 659370a..5d33f68 100644
--- a/superkaramba/src/karambainterface.cpp
+++ b/superkaramba/src/karambainterface.cpp
@@ -24,7 +24,7 @@ KarambaIface::~KarambaIface()
 
 karamba* KarambaIface::getKaramba(TQString name)
 {
-  TQWidgetList *list = TQApplication::tqallWidgets();
+  TQWidgetList *list = TQApplication::allWidgets();
   TQWidgetListIt it(*list);  // iterate over the widgets
   TQWidget* w;
   karamba* result = 0;
@@ -49,7 +49,7 @@ karamba* KarambaIface::getKaramba(TQString name)
 
 ThemesDlg* KarambaIface::getThemeWnd()
 {
-  TQWidgetList  *list = TQApplication::tqallWidgets();
+  TQWidgetList  *list = TQApplication::allWidgets();
   TQWidgetListIt it( *list );         // iterate over the widgets
   TQWidget* w;
   ThemesDlg* result = 0;
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 74ce4ed..a6cd2c3 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -34,7 +34,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&)
 
   TQString openThemes="";
 
-  TQWidgetList  *list = TQApplication::tqallWidgets();
+  TQWidgetList  *list = TQApplication::allWidgets();
   TQWidgetListIt it( *list );         // iterate over the widgets
   TQWidget * w;
   while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp
index 5044161..999fe0f 100644
--- a/superkaramba/src/richtextlabel.cpp
+++ b/superkaramba/src/richtextlabel.cpp
@@ -17,7 +17,7 @@ RichTextLabel::RichTextLabel(karamba* k) :
     Meter(k, 0, 0, 100, 100),
     text(0),
     source(""),
-    colorGrp(k->tqcolorGroup()),
+    colorGrp(k->colorGroup()),
     underlineLinks(false)
 {
   originalSize = TQSize(0, 0);
@@ -27,7 +27,7 @@ RichTextLabel::RichTextLabel(karamba* k, int x, int y, int w, int h) :
     Meter(k, x, y, w, h),
     text(0),
     source(""),
-    colorGrp(k->tqcolorGroup()),
+    colorGrp(k->colorGroup()),
     underlineLinks(false)
 {
   kdDebug() << k_funcinfo << x << ", " << y << ", " << w << ", " << h << endl;
diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp
index a3be722..2c10659 100644
--- a/superkaramba/src/textfield.cpp
+++ b/superkaramba/src/textfield.cpp
@@ -18,7 +18,7 @@ TextField::TextField( )
   setColor(TQColor(192, 192, 192));
   setBGColor(TQColor(0, 0, 0));
   setFont("Helvetica");
-  tqsetAlignment(TQt::AlignLeft);
+  setAlignment(TQt::AlignLeft);
   setFixedPitch(false);
   setShadow(0);
 }
@@ -35,7 +35,7 @@ TextField::TextField( const TextField& def )
     setBGColor(def.getBGColor());
 
     setFont( def.getFont() );
-    tqsetAlignment( def.getAlignment() );
+    setAlignment( def.getAlignment() );
     setFixedPitch( def.getFixedPitch() );
     setShadow( def.getShadow() );
 }
@@ -51,7 +51,7 @@ TextField& TextField::operator=(const TextField& rhs)
     setBGColor(rhs.getBGColor());
 
     setFont( rhs.getFont() );
-    tqsetAlignment( rhs.getAlignment() );
+    setAlignment( rhs.getAlignment() );
     setFixedPitch( rhs.getFixedPitch() );
     setShadow( rhs.getShadow() );
 
@@ -102,7 +102,7 @@ int TextField::getFontSize() const
     return font.pointSize();
 }
 
-void TextField::tqsetAlignment( const TQString &align )
+void TextField::setAlignment( const TQString &align )
 {
     TQString a = align.upper();
     if( a == "LEFT" || a.isEmpty() )
@@ -113,7 +113,7 @@ void TextField::tqsetAlignment( const TQString &align )
         tqalignment = TQt::AlignHCenter;
 }
 
-void TextField::tqsetAlignment( int af )
+void TextField::setAlignment( int af )
 {
     tqalignment = af;
 }
diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h
index 34f17c3..111f053 100644
--- a/superkaramba/src/textfield.h
+++ b/superkaramba/src/textfield.h
@@ -31,8 +31,8 @@ public:
     void setColor(TQColor clr);
     void setBGColor(TQColor clr);
     void setFont( const TQString& );
-    void tqsetAlignment( int );
-    void tqsetAlignment( const TQString& );
+    void setAlignment( int );
+    void setAlignment( const TQString& );
     void setFixedPitch( bool );
     void setShadow( int );
 
diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp
index 0cf8891..a33ea97 100644
--- a/superkaramba/src/textlabel.cpp
+++ b/superkaramba/src/textlabel.cpp
@@ -131,7 +131,7 @@ int TextLabel::getFontSize() const
     return font.pixelSize();
 }
 
-void TextLabel::tqsetAlignment( TQString align )
+void TextLabel::setAlignment( TQString align )
 {
     TQString a = align.upper();
     if( a == "LEFT" || a.isEmpty() )
diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h
index b29c44e..b3579e1 100644
--- a/superkaramba/src/textlabel.h
+++ b/superkaramba/src/textlabel.h
@@ -40,7 +40,7 @@ public:
     void setFontSize( int );
     void setBGColor(TQColor clr);
     void setFont( TQString );
-    void tqsetAlignment( TQString );
+    void setAlignment( TQString );
     void setFixedPitch( bool );
     void setShadow( int );
     void mUpdate( TQPainter * );
diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp
index e7d2498..3cf6e3e 100644
--- a/superkaramba/src/textlabel_python.cpp
+++ b/superkaramba/src/textlabel_python.cpp
@@ -206,7 +206,7 @@ PyObject* py_setTextAlign(PyObject *, PyObject *args)
     return NULL;
   if (!checkKarambaAndMeter(widget, textSensor, "TextLabel"))
     return NULL;
-  ((TextLabel*)textSensor)->tqsetAlignment( text );
+  ((TextLabel*)textSensor)->setAlignment( text );
   return Py_BuildValue((char*)"l", 1);
 }
 
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index b3ee3a1..9fa108d 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -12,7 +12,7 @@
             <height>517</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -111,7 +111,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -122,7 +122,7 @@
                     <property name="name">
                         <cstring>buttonAddToDesktop</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -139,7 +139,7 @@
                     <property name="name">
                         <cstring>buttonClose</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index f7749cc..f483a04 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -220,9 +220,9 @@ void ThemesDlg::getNewStuff()
   KConfig* config = KGlobal::config();
   config->setGroup("KNewStuff");
   config->writePathEntry("ProvidersUrl",
-      TQString::tqfromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+      TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
   config->sync();
-  m_newStufftqStatus = config->entryMap("KNewStuffStatus").keys();
+  m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
   //This check is b/c KNewStuff will download, throw an error, 
   //and still have the entry in the config that it was successful
   configSanityCheck();
@@ -304,8 +304,8 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
   KConfig* config = KGlobal::config();
   TQStringList keys = config->entryMap("KNewStuffStatus").keys();
 
-  for(TQStringList::Iterator it = m_newStufftqStatus.begin();
-      it != m_newStufftqStatus.end(); ++it)
+  for(TQStringList::Iterator it = m_newStuffStatus.begin();
+      it != m_newStuffStatus.end(); ++it)
   {
     keys.remove(*it);
   }
@@ -477,7 +477,7 @@ void ThemesDlg::uninstall()
       tableThemes->removeItem( twPtr );
     }
 #ifdef HAVE_KNEWSTUFF
-    // Remove theme from KNewStufftqStatus
+    // Remove theme from KNewStuffStatus
     KConfig* config = KGlobal::config();
     config->setGroup("KNewStuffNames");
     TQString name = config->readEntry(tempPath);
@@ -507,7 +507,7 @@ void ThemesDlg::uninstall()
     }
     tableThemes->removeItem(w);
 #ifdef HAVE_KNEWSTUFF
-    // Remove theme from KNewStufftqStatus
+    // Remove theme from KNewStuffStatus
     KConfig* config = KGlobal::config();
     config->setGroup("KNewStuffNames");
     TQString name = config->readEntry(theme.path());
diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
index bf4fab5..b75c820 100644
--- a/superkaramba/src/themesdlg.h
+++ b/superkaramba/src/themesdlg.h
@@ -74,7 +74,7 @@ class ThemesDlg : public ThemesLayout
 #ifdef HAVE_KNEWSTUFF
   private:
     SKNewStuff *mNewStuff;
-    TQStringList m_newStufftqStatus;
+    TQStringList m_newStuffStatus;
 #endif
 };
 
diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui
index 5ab1b70..0159820 100644
--- a/superkaramba/src/themewidget_layout.ui
+++ b/superkaramba/src/themewidget_layout.ui
@@ -35,7 +35,7 @@
                     <property name="name">
                         <cstring>icon</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>76</width>
                             <height>0</height>
@@ -143,7 +143,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>