1 files changed, 36 insertions, 36 deletions

diff --git a/kiosktool/menueditComponent.cpp b/kiosktool/menueditComponent.cpp
index 83606c6..c087e91 100644
--- a/kiosktool/menueditComponent.cpp
+++ b/kiosktool/menueditComponent.cpp
@@ -19,9 +19,9 @@
 
 #include "menueditComponent.h"
 
-#include <qdir.h>
-#include <qdom.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqdom.h>
+#include <tqfileinfo.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -35,7 +35,7 @@
 #include "kioskrun.h"
 #include "kiosksync.h"
 
-MenuEditComponent::MenuEditComponent( QObject *parent)
+MenuEditComponent::MenuEditComponent( TQObject *parent)
  : Component(parent)
 {
 }
@@ -55,17 +55,17 @@ MenuEditComponent::slotSetupStarted()
 {
 }
 
-static QDomDocument loadDoc(const QString &fileName)
+static TQDomDocument loadDoc(const TQString &fileName)
 {
-   QDomDocument doc;
+   TQDomDocument doc;
 
-   QFile file( fileName );
+   TQFile file( fileName );
    if ( !file.open( IO_ReadOnly ) )
    {
       kdWarning() << "Could not open " << fileName << endl;
       return doc;
    }
-   QString errorMsg;
+   TQString errorMsg;
    int errorRow;
    int errorCol;
    if ( !doc.setContent( &file, &errorMsg, &errorRow, &errorCol ) ) {
@@ -77,11 +77,11 @@ static QDomDocument loadDoc(const QString &fileName)
    return doc;
 }
 
-static bool saveDoc(const QString &fileName, QDomDocument doc)
+static bool saveDoc(const TQString &fileName, TQDomDocument doc)
 {
    KSaveFile saveFile(fileName);
 
-   QTextStream *stream = saveFile.textStream();
+   TQTextStream *stream = saveFile.textStream();
    if (!stream)
    {
       kdWarning() << "Could not write " << fileName << endl;
@@ -103,50 +103,50 @@ bool
 MenuEditComponent::setupFinished()
 {
    bool result;
-   QString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
-   QString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
-   QString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
+   TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
+   TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
+   TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
 
    kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl;
    kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl;
    kdDebug() << "MenuEditComponent: menuFileSave = " << menuFileSave << endl;
 
-   QDomDocument docChanges = loadDoc(menuEditFile);
+   TQDomDocument docChanges = loadDoc(menuEditFile);
    if (docChanges.isNull())
    {
        kdDebug() << "No menu changes." << endl;
        return true;
    }
 
-   QDomDocument doc = loadDoc(menuFile);
+   TQDomDocument doc = loadDoc(menuFile);
    if (doc.isNull())
    {
        kdWarning() << "Can't find menu file!" << endl;
        return true;
    }
 
-   QDomElement docElem = doc.documentElement();
-   QDomNode n = docElem.firstChild();
-   QDomNode next;
+   TQDomElement docElem = doc.documentElement();
+   TQDomNode n = docElem.firstChild();
+   TQDomNode next;
    for(; !n.isNull(); n = next ) 
    {
-      QDomElement e = n.toElement(); // try to convert the node to an element.
+      TQDomElement e = n.toElement(); // try to convert the node to an element.
       next = n.nextSibling();
 
       if ((e.tagName() == "MergeFile") && (e.text() == "applications-kmenuedit.menu"))
          break;
    }
-   QDomNode insertionPoint = n;
+   TQDomNode insertionPoint = n;
    if (insertionPoint.isNull())
    {
       kdWarning() << "Application menu fails to include applications-kmenuedit.menu" << endl;
       return false;
    }
-   QDomElement docChangesElem = docChanges.documentElement();
+   TQDomElement docChangesElem = docChanges.documentElement();
    n = docChangesElem.firstChild();
    for(; !n.isNull(); n = next ) 
    {
-      QDomElement e = n.toElement(); // try to convert the node to an element.
+      TQDomElement e = n.toElement(); // try to convert the node to an element.
       next = n.nextSibling();
 
       docElem.insertBefore(n, insertionPoint);
@@ -162,15 +162,15 @@ MenuEditComponent::setupFinished()
 
    // Install .desktop files
    {
-      QString legacyApplications = KioskRun::self()->locateLocal("apps", QString::null);
-      QString legacySaveApplications = KioskRun::self()->locateSave("apps", QString::null);
+      TQString legacyApplications = KioskRun::self()->locateLocal("apps", TQString());
+      TQString legacySaveApplications = KioskRun::self()->locateSave("apps", TQString());
       
       KioskSync legacyDir(kapp->mainWidget());
       legacyDir.addDir(legacyApplications, KURL());
 
-      QStringList newLegacyApplications = legacyDir.listFiles();
+      TQStringList newLegacyApplications = legacyDir.listFiles();
    
-      for(QStringList::ConstIterator it = newLegacyApplications.begin();
+      for(TQStringList::ConstIterator it = newLegacyApplications.begin();
           it != newLegacyApplications.end(); ++it)
       {
          if ((*it).endsWith(".desktop") || (*it).endsWith(".kdelnk") || (*it).endsWith(".directory"))
@@ -184,15 +184,15 @@ MenuEditComponent::setupFinished()
 
    // Install .desktop files
    {
-      QString xdgApplications = KioskRun::self()->locateLocal("xdgdata-apps", QString::null);
-      QString xdgSaveApplications = KioskRun::self()->locateSave("xdgdata-apps", QString::null);
+      TQString xdgApplications = KioskRun::self()->locateLocal("xdgdata-apps", TQString());
+      TQString xdgSaveApplications = KioskRun::self()->locateSave("xdgdata-apps", TQString());
 
-      QDir dir(xdgApplications);
-      QStringList newXdgApplications = dir.entryList(QDir::All, QDir::Unsorted);
+      TQDir dir(xdgApplications);
+      TQStringList newXdgApplications = dir.entryList(TQDir::All, TQDir::Unsorted);
       newXdgApplications.remove(".");
       newXdgApplications.remove("..");
    
-      for(QStringList::ConstIterator it = newXdgApplications.begin();
+      for(TQStringList::ConstIterator it = newXdgApplications.begin();
           it != newXdgApplications.end(); ++it)
       {
          if ((*it).endsWith(".desktop") || (*it).endsWith(".kdelnk"))
@@ -206,15 +206,15 @@ MenuEditComponent::setupFinished()
 
    // Install .directory files
    {
-      QString xdgDirectories = KioskRun::self()->locateLocal("xdgdata-dirs", QString::null);
-      QString xdgSaveDirectories = KioskRun::self()->locateSave("xdgdata-dirs", QString::null);
+      TQString xdgDirectories = KioskRun::self()->locateLocal("xdgdata-dirs", TQString());
+      TQString xdgSaveDirectories = KioskRun::self()->locateSave("xdgdata-dirs", TQString());
 
-      QDir dir(xdgDirectories);
-      QStringList newXdgDirectories = dir.entryList(QDir::All, QDir::Unsorted);
+      TQDir dir(xdgDirectories);
+      TQStringList newXdgDirectories = dir.entryList(TQDir::All, TQDir::Unsorted);
       newXdgDirectories.remove(".");
       newXdgDirectories.remove("..");
 
-      for(QStringList::ConstIterator it = newXdgDirectories.begin();
+      for(TQStringList::ConstIterator it = newXdgDirectories.begin();
           it != newXdgDirectories.end(); ++it)
       {
          if ((*it).endsWith(".directory"))