1 files changed, 35 insertions, 35 deletions

diff --git a/kiosktool/desktopComponent.cpp b/kiosktool/desktopComponent.cpp
index b8aa060..5456687 100644
--- a/kiosktool/desktopComponent.cpp
+++ b/kiosktool/desktopComponent.cpp
@@ -19,8 +19,8 @@
 
 #include "desktopComponent.h"
 
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
 
 #include <kdebug.h>
 #include <kmimetype.h>
@@ -32,7 +32,7 @@
 
 #include "kioskrun.h"
 
-DesktopComponent::DesktopComponent( QObject *parent)
+DesktopComponent::DesktopComponent( TQObject *parent)
  : Component(parent)
 {
 }
@@ -45,19 +45,19 @@ void
 DesktopComponent::slotSetupPrepare()
 {
    m_iconPositionsFile = KioskRun::self()->locateLocal("data", "kdesktop/IconPositions");
-   ::unlink(QFile::encodeName(m_iconPositionsFile));
-   connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotSetupStarted()));
+   ::unlink(TQFile::encodeName(m_iconPositionsFile));
+   connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
 }
 
 void
 DesktopComponent::slotSetupStarted()
 {
-   QString desktop = KioskRun::self()->desktopPath();
-   QFileInfo info(desktop);
+   TQString desktop = KioskRun::self()->desktopPath();
+   TQFileInfo info(desktop);
    if (info.exists())
    {
-      disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(slotSetupStarted()));
-      connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotSetupReady()));
+      disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
+      connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupReady()));
       m_timer.start(1000, true);
    }
    else
@@ -66,13 +66,13 @@ DesktopComponent::slotSetupStarted()
    }
 }
 
-void filterFileList(const QString &path, QStringList *files, QStringList *oldFiles)
+void filterFileList(const TQString &path, TQStringList *files, TQStringList *oldFiles)
 {
    files->remove(".");
    files->remove("..");
 
-   QStringList::Iterator next;
-   for(QStringList::Iterator it = files->begin();
+   TQStringList::Iterator next;
+   for(TQStringList::Iterator it = files->begin();
        it != files->end(); it = next)
    {
       next = it;
@@ -100,10 +100,10 @@ void filterFileList(const QString &path, QStringList *files, QStringList *oldFil
 void
 DesktopComponent::slotSetupReady()
 {
-   QString desktop = KioskRun::self()->desktopPath();
+   TQString desktop = KioskRun::self()->desktopPath();
    
-   QDir dir(desktop);
-   m_origDesktopFiles = dir.entryList(QDir::All, QDir::Unsorted);
+   TQDir dir(desktop);
+   m_origDesktopFiles = dir.entryList(TQDir::All, TQDir::Unsorted);
    
    filterFileList(desktop, &m_origDesktopFiles, 0);
 }
@@ -113,16 +113,16 @@ DesktopComponent::setupFinished()
 {
    bool result = true;
    
-   disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(slotSetupStarted()));
-   disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(slotSetupReady()));
+   disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupStarted()));
+   disconnect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetupReady()));
    m_timer.stop();
    
    KSimpleConfig newCfg(m_iconPositionsFile, true);
 
-   QString desktop = KioskRun::self()->desktopPath();
+   TQString desktop = KioskRun::self()->desktopPath();
    
-   QDir dir(desktop);
-   QStringList newDesktopFiles = dir.entryList(QDir::All, QDir::Unsorted);
+   TQDir dir(desktop);
+   TQStringList newDesktopFiles = dir.entryList(TQDir::All, TQDir::Unsorted);
    filterFileList(desktop, &newDesktopFiles, &m_origDesktopFiles);
 
    KTempFile positionsFile;
@@ -130,12 +130,12 @@ DesktopComponent::setupFinished()
 
    KSimpleConfig positions(positionsFile.name());
    
-   QStringList newGroups = newCfg.groupList();
+   TQStringList newGroups = newCfg.groupList();
 
-   QString prefix = "IconPosition::";
+   TQString prefix = "IconPosition::";
 
    // Save icon positions
-   for(QStringList::Iterator it = newGroups.begin();
+   for(TQStringList::Iterator it = newGroups.begin();
        it != newGroups.end(); ++it)
    {
       if (!(*it).startsWith(prefix))
@@ -151,8 +151,8 @@ DesktopComponent::setupFinished()
    }
 
    // Remove old icons from new list
-   QStringList::Iterator next;
-   for(QStringList::Iterator it = m_origDesktopFiles.begin();
+   TQStringList::Iterator next;
+   for(TQStringList::Iterator it = m_origDesktopFiles.begin();
        it != m_origDesktopFiles.end(); it = next)
    {
       next = it;
@@ -166,17 +166,17 @@ DesktopComponent::setupFinished()
       
    }
 
-   QString installPath = KioskRun::self()->locateSave("data", "kdesktop/Desktop/");
-   QString installPath2 = KioskRun::self()->locateSave("data", "kdesktop/DesktopLinks/");
+   TQString installPath = KioskRun::self()->locateSave("data", "kdesktop/Desktop/");
+   TQString installPath2 = KioskRun::self()->locateSave("data", "kdesktop/DesktopLinks/");
 
    // Remove all icons that are no longer
-   for(QStringList::Iterator it = m_origDesktopFiles.begin();
+   for(TQStringList::Iterator it = m_origDesktopFiles.begin();
        it != m_origDesktopFiles.end(); ++it)
    {
-      QString file;
-      if (QFile::exists(installPath + *it))
+      TQString file;
+      if (TQFile::exists(installPath + *it))
          file = installPath + *it;
-      else if (QFile::exists(installPath2 + *it))
+      else if (TQFile::exists(installPath2 + *it))
          file = installPath2 + *it;
 
       if (!file.isEmpty())
@@ -187,7 +187,7 @@ DesktopComponent::setupFinished()
       }
       else
       {
-         QString installFile = installPath + *it;
+         TQString installFile = installPath + *it;
          file = KioskRun::self()->locate("data", "kdesktop/Desktop/" + *it);
          if (file.isEmpty())
          {
@@ -219,11 +219,11 @@ DesktopComponent::setupFinished()
    if (!result) return false;
 
    // Add all icons that have been added
-   for(QStringList::Iterator it = newDesktopFiles.begin();
+   for(TQStringList::Iterator it = newDesktopFiles.begin();
        it != newDesktopFiles.end(); ++it)
    {
-      QString file = KioskRun::self()->desktopPath() + *it;
-      if (QFile::exists(file))
+      TQString file = KioskRun::self()->desktopPath() + *it;
+      if (TQFile::exists(file))
       {
          result = KioskRun::self()->install(file, installPath + *it);
          if (!result) return false;