1 files changed, 31 insertions, 31 deletions

diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index 73f410f..4396218 100644
--- a/kiosktool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
@@ -19,8 +19,8 @@
 
 #include "profilePropsPage.h"
 
-#include <qcombobox.h>
-#include <qvalidator.h>
+#include <tqcombobox.h>
+#include <tqvalidator.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -33,10 +33,10 @@
 #include "kioskrun.h"
 #include "kiosksync.h"
 
-static QStringList userList()
+static TQStringList userList()
 {
    KUser thisUser;
-   QStringList result;
+   TQStringList result;
    result << thisUser.loginName();
    result << "root";
 
@@ -46,8 +46,8 @@ static QStringList userList()
    result.sort();
 
    // Remove dupes
-   QStringList::Iterator nextIt = result.begin();
-   for(QStringList::Iterator it = result.begin();
+   TQStringList::Iterator nextIt = result.begin();
+   for(TQStringList::Iterator it = result.begin();
        it != result.end(); it = nextIt)
    {
       nextIt = it;
@@ -61,7 +61,7 @@ static QStringList userList()
 }
 
 
-ProfilePropsPage::ProfilePropsPage(QWidget *parent, const QString &profile)
+ProfilePropsPage::ProfilePropsPage(TQWidget *parent, const TQString &profile)
  : ProfilePropsPageUI(parent), PageWidget(this), m_profile(profile)
 {
 }
@@ -72,11 +72,11 @@ ProfilePropsPage::~ProfilePropsPage()
 
 void ProfilePropsPage::slotProfileNameChanged()
 {
-  QString profile = editProfileName->text();
+  TQString profile = editProfileName->text();
   if (m_fixedProfileDir)
   {
-    QString profilePrefix = KioskRun::self()->getProfilePrefix();
-    QString installDir = profilePrefix+profile+"/";
+    TQString profilePrefix = KioskRun::self()->getProfilePrefix();
+    TQString installDir = profilePrefix+profile+"/";
     labelInstallDir->setText(installDir);
   }
 // TODO:  enableButtonOK(!profile.isEmpty());
@@ -91,28 +91,28 @@ void ProfilePropsPage::load()
     bNewProfile = true;
   }
 
-  QString profilePrefix = KioskRun::self()->getProfilePrefix();
+  TQString profilePrefix = KioskRun::self()->getProfilePrefix();
   m_fixedProfileDir = !profilePrefix.isEmpty();
-  connect(editProfileName, SIGNAL(textChanged(const QString&)),
-          this, SLOT(slotProfileNameChanged()));
+  connect(editProfileName, TQT_SIGNAL(textChanged(const TQString&)),
+          this, TQT_SLOT(slotProfileNameChanged()));
   
 #if 0
-  connect(kurlInstallDir, SIGNAL(textChanged(const QString&)),
-          this, SLOT(updateButtons()));
+  connect(kurlInstallDir, TQT_SIGNAL(textChanged(const TQString&)),
+          this, TQT_SLOT(updateButtons()));
 #endif
 
   comboUser->setEditable(true);
   comboUser->insertStringList(userList());
 
-  QRegExp rx( "[^/ :]*" );
-  QValidator* validator = new QRegExpValidator( rx, this );
+  TQRegExp rx( "[^/ :]*" );
+  TQValidator* validator = new TQRegExpValidator( rx, this );
 
   editProfileName->setValidator(validator);
   editProfileName->setFocus();
 
-  QString description;
-  QString installDir;
-  QString installUser;
+  TQString description;
+  TQString installDir;
+  TQString installUser;
 
   KioskRun::self()->getProfileInfo(m_profile, description, installDir, installUser);
 
@@ -145,19 +145,19 @@ void ProfilePropsPage::load()
 
 bool ProfilePropsPage::save()
 {
-  QString user = comboUser->currentText();
+  TQString user = comboUser->currentText();
   KUser userInfo(user);
   if (!userInfo.isValid())
   {
      KMessageBox::sorry(this,
-       i18n("<qt>The user <b>%1</b> is not an existing user.</qt>").arg(user));
+       i18n("<qt>The user <b>%1</b> is not an existing user.</qt>").tqarg(user));
      comboUser->setFocus();
      return false;
   }
      
   m_profile = editProfileName->text();
-  QString description = editDescription->text();
-  QString installDir;
+  TQString description = editDescription->text();
+  TQString installDir;
   if (m_fixedProfileDir)
   {
     installDir = labelInstallDir->text();
@@ -174,7 +174,7 @@ bool ProfilePropsPage::save()
   {
     KioskSync origInstallDir;
     origInstallDir.addDir(m_origInstallDir, KURL());
-    QStringList fileList = origInstallDir.listFiles();
+    TQStringList fileList = origInstallDir.listFiles();
     fileList.remove(".kdeprofile");
     if (!fileList.isEmpty())
     {
@@ -182,7 +182,7 @@ bool ProfilePropsPage::save()
                           i18n("<qt>The directory for this profile has changed "
                                "from <b>%1</b> to <b>%2</b>.<p>"
                                "The following files under <b>%3</b> will be moved to <b>%4</b>")
-                               .arg(m_origInstallDir, installDir, m_origInstallDir, installDir),
+                               .tqarg(m_origInstallDir, installDir, m_origInstallDir, installDir),
                           fileList,
                           i18n("Profile Directory Changed"));
        if (msgResult != KMessageBox::Continue)
@@ -191,14 +191,14 @@ bool ProfilePropsPage::save()
     KioskRun::self()->setUser(user);
     if (!KioskRun::self()->move(m_origInstallDir, installDir, fileList))
        return false;
-    if (QDir(m_origInstallDir).exists())
+    if (TQDir(m_origInstallDir).exists())
     {
        if (!KioskRun::self()->remove(m_origInstallDir))
           return false;
     }
   }
 
-  QString installUser = user;
+  TQString installUser = user;
 
   bool result = KioskRun::self()->setProfileInfo( m_profile, description, installDir, installUser);
 
@@ -210,7 +210,7 @@ bool ProfilePropsPage::save()
   // Store this user for easy access later
   KConfig *config = kapp->config();
   config->setGroup("General");
-  QStringList previousUsers= config->readListEntry("PreviousUsers");
+  TQStringList previousUsers= config->readListEntry("PreviousUsers");
   if (!previousUsers.contains(user))
   {
      previousUsers << user;
@@ -226,9 +226,9 @@ void ProfilePropsPage::setFocus()
   editProfileName->setFocus();
 }
 
-QString ProfilePropsPage::subCaption()
+TQString ProfilePropsPage::subCaption()
 {
-  return QString::null;
+  return TQString();
 }
 
 #include "profilePropsPage.moc"