Rename old tq methods that no longer need a unique name

15 files changed, 77 insertions, 77 deletions

diff --git a/kiosktool/componentPage_ui.ui b/kiosktool/componentPage_ui.ui
index bc4c6c1..1f73734 100644
--- a/kiosktool/componentPage_ui.ui
+++ b/kiosktool/componentPage_ui.ui
@@ -23,13 +23,13 @@
             <property name="name">
                 <cstring>componentDescription</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>140</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>140</height>
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -113,7 +113,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>171</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -162,7 +162,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>150</height>
diff --git a/kiosktool/componentSelectionPage_ui.ui b/kiosktool/componentSelectionPage_ui.ui
index 6069bda..442fa60 100644
--- a/kiosktool/componentSelectionPage_ui.ui
+++ b/kiosktool/componentSelectionPage_ui.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -79,7 +79,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>211</height>
@@ -100,7 +100,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>400</width>
                     <height>200</height>
diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp
index 9866a94..ea46796 100644
--- a/kiosktool/kcms/autostart/kcmautostart.cpp
+++ b/kiosktool/kcms/autostart/kcmautostart.cpp
@@ -106,7 +106,7 @@ void AutoStartConfig::setAutoloadEnabled(KConfig *config, const TQString &filena
 void AutoStartConfig::load() {
     _lvStartup->clear();
 
-    TQStringList files = KGlobal::dirs()->findAllResources( "autostart", TQString::tqfromLatin1( "*.desktop" ), false, true );
+    TQStringList files = KGlobal::dirs()->findAllResources( "autostart", TQString::fromLatin1( "*.desktop" ), false, true );
 
     for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); it++ )
     {
diff --git a/kiosktool/kioskConfigDialog_ui.ui b/kiosktool/kioskConfigDialog_ui.ui
index 0bb5ef2..af0f0f3 100644
--- a/kiosktool/kioskConfigDialog_ui.ui
+++ b/kiosktool/kioskConfigDialog_ui.ui
@@ -42,7 +42,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -179,7 +179,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>500</width>
                                     <height>10</height>
@@ -231,7 +231,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -259,7 +259,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
@@ -278,7 +278,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kiosktool/kioskdata.cpp b/kiosktool/kioskdata.cpp
index 135c8f2..ff45343 100644
--- a/kiosktool/kioskdata.cpp
+++ b/kiosktool/kioskdata.cpp
@@ -51,7 +51,7 @@ static TQDict<TQString> *readStdActionCaptions()
      TQString caption = action->text();
      caption.replace("&","");
        
-     captions->insert(TQString::tqfromLatin1(action->name()), new TQString(caption));
+     captions->insert(TQString::fromLatin1(action->name()), new TQString(caption));
   }
   return captions;
 }
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index 8164dc8..cf16172 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -338,7 +338,7 @@ KioskRun::shutdownConfigEnv()
    m_instance = 0;
 }
 
-class ImmutabletqStatus
+class ImmutableStatus
 {
 public:
    bool m_fileScope;
@@ -352,7 +352,7 @@ bool
 KioskRun::isConfigImmutable(const TQString &filename, const TQString &group)
 {
    (void) configFile(filename);
-   ImmutabletqStatus *status = m_immutableStatusCache.find(filename);
+   ImmutableStatus *status = m_immutableStatusCache.find(filename);
    assert(status);
    if (group.isEmpty())
       return status->m_fileScope;
@@ -364,7 +364,7 @@ void
 KioskRun::setConfigImmutable(const TQString &filename, const TQString &_group, bool bImmutable)
 {
    (void) configFile(filename);
-   ImmutabletqStatus *status = m_immutableStatusCache.find(filename);
+   ImmutableStatus *status = m_immutableStatusCache.find(filename);
    assert(status);
    if (_group.isEmpty())
    {
@@ -412,9 +412,9 @@ static void addImmutable(TQString &ext)
 }
 
 TQString
-KioskRun::saveImmutabletqStatus(const TQString &filename)
+KioskRun::saveImmutableStatus(const TQString &filename)
 {
-   ImmutabletqStatus *status = new ImmutabletqStatus;
+   ImmutableStatus *status = new ImmutableStatus;
    status->m_fileScope = false;
    status->m_dirty = false;
    m_immutableStatusCache.insert(filename, status);
@@ -505,21 +505,21 @@ KioskRun::saveImmutabletqStatus(const TQString &filename)
 }
 
 bool
-KioskRun::restoreImmutabletqStatus(const TQString &filename, bool force)
+KioskRun::restoreImmutableStatus(const TQString &filename, bool force)
 {
-   ImmutabletqStatus *status = m_immutableStatusCache.take(filename);
+   ImmutableStatus *status = m_immutableStatusCache.take(filename);
    if (!status)
    {
-      kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") status info missing" << endl;
+      kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") status info missing" << endl;
       return true;
    }
    if (!force && !status->m_dirty)
    {
-      kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") not changed" << endl;
+      kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") not changed" << endl;
       delete status;
       return true;
    }
-   kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") restoring" << endl;
+   kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") restoring" << endl;
 
    TQString path = status->m_tmpFile;
    
@@ -625,7 +625,7 @@ KioskRun::flushConfigCache()
       KConfig *config = it.current();
       bool dirty = config->isDirty();
       config->sync(); // Save
-      if (!restoreImmutabletqStatus(file, dirty))
+      if (!restoreImmutableStatus(file, dirty))
          return false;
       m_saveConfigCache.remove(file);
    }
@@ -646,7 +646,7 @@ KioskRun::configFile(const TQString &filename)
 
    setupConfigEnv();
    
-   TQString saveLocation = saveImmutabletqStatus(filename);
+   TQString saveLocation = saveImmutableStatus(filename);
    config = new KSimpleConfig(saveLocation);
    m_saveConfigCache.insert(filename, config);
    
diff --git a/kiosktool/kioskrun.h b/kiosktool/kioskrun.h
index dcd114f..0a11815 100644
--- a/kiosktool/kioskrun.h
+++ b/kiosktool/kioskrun.h
@@ -30,7 +30,7 @@
 
 #include <kprogress.h>
 
-class ImmutabletqStatus;
+class ImmutableStatus;
 class KConfig;
 class KProcess;
 class KSimpleConfig;
@@ -182,8 +182,8 @@ protected:
   void shutdownConfigEnv();
   void applyEnvironment(KProcess *p);
 
-  TQString saveImmutabletqStatus(const TQString &filename);
-  bool restoreImmutabletqStatus(const TQString &filename, bool force);
+  TQString saveImmutableStatus(const TQString &filename);
+  bool restoreImmutableStatus(const TQString &filename, bool force);
 
   void setCustomRestrictionFileBrowsing(bool restrict);
 
@@ -200,7 +200,7 @@ private:
   KInstance *m_instance;
   KInstance *m_saveInstance;
   TQDict<KConfig> m_saveConfigCache;
-  TQDict<ImmutabletqStatus> m_immutableStatusCache;
+  TQDict<ImmutableStatus> m_immutableStatusCache;
   bool m_noRestrictions;
   bool m_forceSycocaUpdate;
   bool m_isRoot;
diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp
index 47d8ee2..15e85b2 100644
--- a/kiosktool/kiosktool-tdedirs.cpp
+++ b/kiosktool/kiosktool-tdedirs.cpp
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
     while(!profiles.isEmpty())
     {
         TQString profile = profiles.back();
-        config->setGroup(TQString::tqfromLatin1("Directories-%1").tqarg(profile));
+        config->setGroup(TQString::fromLatin1("Directories-%1").tqarg(profile));
         profiles.pop_back();
         TQStringList list = config->readListEntry("prefixes");
         for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++)
diff --git a/kiosktool/mainview.ui b/kiosktool/mainview.ui
index e08f69a..006e84f 100644
--- a/kiosktool/mainview.ui
+++ b/kiosktool/mainview.ui
@@ -31,7 +31,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>70</height>
@@ -56,7 +56,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>160</width>
                     <height>170</height>
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>25</width>
                     <height>20</height>
@@ -115,7 +115,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>25</width>
                     <height>20</height>
@@ -191,7 +191,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -216,7 +216,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -245,7 +245,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>160</width>
                     <height>20</height>
diff --git a/kiosktool/profilePropsPage_ui.ui b/kiosktool/profilePropsPage_ui.ui
index 32a50f8..96043b2 100644
--- a/kiosktool/profilePropsPage_ui.ui
+++ b/kiosktool/profilePropsPage_ui.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>60</width>
                     <height>20</height>
@@ -88,7 +88,7 @@
                     <property name="name">
                         <cstring>editProfileName</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -105,7 +105,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -130,7 +130,7 @@
                     <property name="name">
                         <cstring>editDescription</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -147,7 +147,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -183,7 +183,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -208,7 +208,7 @@
                     <property name="name">
                         <cstring>kurlInstallDir</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -235,7 +235,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kiosktool/profileSelectionPage_ui.ui b/kiosktool/profileSelectionPage_ui.ui
index f78200c..b632d46 100644
--- a/kiosktool/profileSelectionPage_ui.ui
+++ b/kiosktool/profileSelectionPage_ui.ui
@@ -32,7 +32,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -73,7 +73,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>220</height>
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>
@@ -157,7 +157,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>
@@ -182,7 +182,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -207,7 +207,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index 2cca956..4bfee8b 100644
--- a/kiosktool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -171,12 +171,12 @@ void UserManagementPage::slotAddGroup()
       KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
       
    UserManagementGroupUI *wid = new UserManagementGroupUI(&dlg);
-   wid->labelCaption->setFixedSize(wid->labelCaption->tqsizeHint());
+   wid->labelCaption->setFixedSize(wid->labelCaption->sizeHint());
    wid->comboGroup->insertStringList(m_allGroups);
    wid->comboProfile->insertStringList(m_allProfiles);
-   wid->setFixedSize(wid->tqsizeHint());
+   wid->setFixedSize(wid->sizeHint());
    dlg.setMainWidget(wid);
-   dlg.setFixedSize(dlg.tqsizeHint());
+   dlg.setFixedSize(dlg.sizeHint());
    while (dlg.exec() == KDialogBase::Accepted)
    {
       TQString group = wid->comboGroup->currentText();
@@ -242,12 +242,12 @@ void UserManagementPage::slotAddUser()
       KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
       
    UserManagementUserUI *wid = new UserManagementUserUI(&dlg);
-   wid->labelCaption->setFixedSize(wid->labelCaption->tqsizeHint());
+   wid->labelCaption->setFixedSize(wid->labelCaption->sizeHint());
    wid->comboUser->insertStringList(m_allUsers);
    wid->comboProfile->insertStringList(m_allProfiles);
-   wid->setFixedSize(wid->tqsizeHint());
+   wid->setFixedSize(wid->sizeHint());
    dlg.setMainWidget(wid);
-   dlg.setFixedSize(dlg.tqsizeHint());
+   dlg.setFixedSize(dlg.sizeHint());
    while (dlg.exec() == KDialogBase::Accepted)
    {
       TQString user = wid->comboUser->currentText();
diff --git a/kiosktool/userManagementGroup_ui.ui b/kiosktool/userManagementGroup_ui.ui
index 261ce5d..98cf8cd 100644
--- a/kiosktool/userManagementGroup_ui.ui
+++ b/kiosktool/userManagementGroup_ui.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>10</height>
@@ -72,7 +72,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>
diff --git a/kiosktool/userManagementUser_ui.ui b/kiosktool/userManagementUser_ui.ui
index f27088a..834c2cd 100644
--- a/kiosktool/userManagementUser_ui.ui
+++ b/kiosktool/userManagementUser_ui.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>10</height>
@@ -72,7 +72,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>
diff --git a/kiosktool/userManagement_ui.ui b/kiosktool/userManagement_ui.ui
index 4167e78..12c6a23 100644
--- a/kiosktool/userManagement_ui.ui
+++ b/kiosktool/userManagement_ui.ui
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -91,7 +91,7 @@
                     <property name="name">
                         <cstring>listGroups</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>350</width>
                             <height>0</height>
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -155,7 +155,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -236,7 +236,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -261,7 +261,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>