diff options
Diffstat (limited to 'kiosktool/kioskrun.cpp')
| -rw-r--r-- | kiosktool/kioskrun.cpp | 500 |
1 files changed, 250 insertions, 250 deletions
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index f243cfc..bdf7353 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -26,8 +26,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include <qdir.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqfile.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -51,17 +51,17 @@ KioskRun *KioskRun::s_self = 0; -KioskRun::KioskRun( QObject* parent, const char* name) - : QObject(parent, name), m_dcopClient(0), m_instance(0), m_localKdercConfig(0) +KioskRun::KioskRun( TQObject* parent, const char* name) + : TQObject(parent, name), m_dcopClient(0), m_instance(0), m_localKdercConfig(0) { m_noRestrictions = false; m_forceSycocaUpdate = false; s_self = this; m_saveConfigCache.setAutoDelete(true); m_immutableStatusCache.setAutoDelete(true); - m_homeDir = QDir::homeDirPath()+"/.kde-test"; + m_homeDir = TQDir::homeDirPath()+"/.kde-test"; KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - m_kderc = QFile::decodeName(args->getOption("kderc")); + m_kderc = TQFile::decodeName(args->getOption("kderc")); m_isRoot = (getuid() == 0); } @@ -72,7 +72,7 @@ KioskRun::~KioskRun() } void -KioskRun::setUser(const QString &user) +KioskRun::setUser(const TQString &user) { if (m_user == user) return; @@ -81,10 +81,10 @@ KioskRun::setUser(const QString &user) m_user = user; } -static void filterDupes(QStringList &list) +static void filterDupes(TQStringList &list) { - QStringList tmp; - for(QStringList::ConstIterator it = list.begin(); + TQStringList tmp; + for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { if (!tmp.contains(*it)) @@ -94,19 +94,19 @@ static void filterDupes(QStringList &list) } void -KioskRun::setKdeDirs(const QStringList &dirs) +KioskRun::setKdeDirs(const TQStringList &dirs) { if (m_kdeDirs == dirs) return; shutdownRuntimeEnv(); shutdownConfigEnv(); m_kdeDirs = dirs; - QStringList xdgDataDirs = QStringList::split(':', QFile::decodeName(getenv("XDG_DATA_DIRS"))); + TQStringList xdgDataDirs = TQStringList::split(':', TQFile::decodeName(getenv("XDG_DATA_DIRS"))); if (xdgDataDirs.isEmpty()) { - xdgDataDirs = QStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes()); + xdgDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes()); xdgDataDirs.pop_front(); - for(QStringList::Iterator it = xdgDataDirs.begin(); + for(TQStringList::Iterator it = xdgDataDirs.begin(); it != xdgDataDirs.end(); ++it) { *it += "share"; @@ -115,7 +115,7 @@ KioskRun::setKdeDirs(const QStringList &dirs) } m_xdgDataDirs.clear(); - for(QStringList::ConstIterator it = dirs.begin(); + for(TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { m_xdgDataDirs.append(*it+"/share"); @@ -123,18 +123,18 @@ KioskRun::setKdeDirs(const QStringList &dirs) m_xdgDataDirs += xdgDataDirs; filterDupes(m_xdgDataDirs); - QStringList xdgConfigDirs = QStringList::split(':', QFile::decodeName(getenv("XDG_CONFIG_DIRS"))); + TQStringList xdgConfigDirs = TQStringList::split(':', TQFile::decodeName(getenv("XDG_CONFIG_DIRS"))); if (xdgConfigDirs.isEmpty()) { xdgConfigDirs << "/etc/xdg"; - QString sysconfMenuDir = KGlobal::dirs()->findDirs("xdgconf-menu", QString::null).last(); + TQString sysconfMenuDir = KGlobal::dirs()->findDirs("xdgconf-menu", TQString()).last(); if (sysconfMenuDir.endsWith("/menus/")) xdgConfigDirs << sysconfMenuDir.left(sysconfMenuDir.length()-7); } m_xdgConfigDirs.clear(); - for(QStringList::ConstIterator it = dirs.begin(); + for(TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { m_xdgConfigDirs.append(*it+"/etc/xdg"); @@ -145,7 +145,7 @@ KioskRun::setKdeDirs(const QStringList &dirs) } void -KioskRun::deleteDir(const QString &dir) +KioskRun::deleteDir(const TQString &dir) { if (dir.length() <= 1) // Safety return; @@ -192,8 +192,8 @@ void KioskRun::updateSycoca() { // Force update - QString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_ksycoca"); - QFile file(sycocaUpdateFile); + TQString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_ksycoca"); + TQFile file(sycocaUpdateFile); file.remove(); file.open(IO_WriteOnly); file.close(); @@ -202,7 +202,7 @@ KioskRun::updateSycoca() } KProcess* -KioskRun::run(const QString &cmd, const QStringList &args) +KioskRun::run(const TQString &cmd, const TQStringList &args) { KProcess *proc = new KProcess(this); @@ -218,10 +218,10 @@ KioskRun::run(const QString &cmd, const QStringList &args) class SetEnv { public: - SetEnv(const char *key, const QString &value) : m_key(key) + SetEnv(const char *key, const TQString &value) : m_key(key) { m_oldValue = getenv(m_key); - setenv(m_key, QFile::encodeName(value), 1); + setenv(m_key, TQFile::encodeName(value), 1); } ~SetEnv() @@ -234,7 +234,7 @@ public: private: const char* m_key; - QCString m_oldValue; + TQCString m_oldValue; }; void @@ -243,11 +243,11 @@ KioskRun::setupConfigEnv() if (m_instance) return; // ::locateLocal must be called before we change the env. vars! - QString newTmpDir = ::locateLocal("tmp", "kioskdir"); - QString newSocketDir = ::locateLocal("socket", "kioskdir"); + TQString newTmpDir = ::locateLocal("tmp", "kioskdir"); + TQString newSocketDir = ::locateLocal("socket", "kioskdir"); SetEnv home("HOME", m_homeDir); - QString kdeHome = m_homeDir+"/.kde"; + TQString kdeHome = m_homeDir+"/.kde"; SetEnv kdehome("KDEHOME", kdeHome); SetEnv kderoothome("KDEROOTHOME", kdeHome); SetEnv kdedirs("KDEDIRS", m_kdeDirs.join(":")); @@ -256,32 +256,32 @@ KioskRun::setupConfigEnv() SetEnv xdgConfigHome("XDG_CONFIG_HOME", m_homeDir+"/.config"); SetEnv xdgConfigDirs("XDG_CONFIG_DIRS", m_xdgConfigDirs.join(":")); - ::mkdir(QFile::encodeName(m_homeDir), 0700); - ::mkdir(QFile::encodeName(kdeHome), 0700); + ::mkdir(TQFile::encodeName(m_homeDir), 0700); + ::mkdir(TQFile::encodeName(kdeHome), 0700); // Create temp & socket dirs. char hostname[256]; hostname[0] = 0; gethostname(hostname, 255); - QString tmpDir = QString("%1/%2-%3").arg(kdeHome).arg("tmp").arg(hostname); + TQString tmpDir = TQString("%1/%2-%3").tqarg(kdeHome).tqarg("tmp").tqarg(hostname); deleteDir(tmpDir); - ::mkdir(QFile::encodeName(newTmpDir), 0700); - ::symlink(QFile::encodeName(newTmpDir), QFile::encodeName(tmpDir)); + ::mkdir(TQFile::encodeName(newTmpDir), 0700); + ::symlink(TQFile::encodeName(newTmpDir), TQFile::encodeName(tmpDir)); - QString socketDir = QString("%1/%2-%3").arg(kdeHome).arg("socket").arg(hostname); + TQString socketDir = TQString("%1/%2-%3").tqarg(kdeHome).tqarg("socket").tqarg(hostname); deleteDir(socketDir); - ::mkdir(QFile::encodeName(newSocketDir), 0700); - ::symlink(QFile::encodeName(newSocketDir), QFile::encodeName(socketDir)); + ::mkdir(TQFile::encodeName(newSocketDir), 0700); + ::symlink(TQFile::encodeName(newSocketDir), TQFile::encodeName(socketDir)); - m_configDir = QString("%1/.kde/share/config/").arg(m_homeDir); + m_configDir = TQString("%1/.kde/share/config/").tqarg(m_homeDir); m_instance = new KInstance("kioskrun"); (void) m_instance->dirs(); // Create KStandardDirs obj m_desktopPath = m_homeDir + "/Desktop/"; m_desktopPath = m_instance->config()->readPathEntry( "Desktop", m_desktopPath); - m_desktopPath = QDir::cleanDirPath( m_desktopPath ); + m_desktopPath = TQDir::cleanDirPath( m_desktopPath ); if ( !m_desktopPath.endsWith("/") ) m_desktopPath.append('/'); @@ -296,35 +296,35 @@ KioskRun::setupConfigEnv() } } -QString -KioskRun::locate(const char *resource, const QString &filename) +TQString +KioskRun::locate(const char *resource, const TQString &filename) { setupConfigEnv(); return m_saveInstance->dirs()->findResource(resource, filename); } -QString -KioskRun::locateSave(const char *resource, const QString &filename) +TQString +KioskRun::locateSave(const char *resource, const TQString &filename) { setupConfigEnv(); // split path from filename int slash = filename.findRev('/')+1; - QString dir = filename.left(slash); - QString file = filename.mid(slash); + TQString dir = filename.left(slash); + TQString file = filename.mid(slash); return m_saveInstance->dirs()->saveLocation(resource, dir, false) + file; } -QString -KioskRun::locateLocal(const char *resource, const QString &filename) +TQString +KioskRun::locateLocal(const char *resource, const TQString &filename) { setupConfigEnv(); // split path from filename int slash = filename.findRev('/')+1; - QString dir = filename.left(slash); - QString file = filename.mid(slash); + TQString dir = filename.left(slash); + TQString file = filename.mid(slash); return m_instance->dirs()->saveLocation(resource, dir, true) + file; } @@ -338,21 +338,21 @@ KioskRun::shutdownConfigEnv() m_instance = 0; } -class ImmutableStatus +class ImmutabletqStatus { public: bool m_fileScope; - QDict<int> m_lines; - QString m_tmpFile; + TQDict<int> m_lines; + TQString m_tmpFile; bool m_dirty; }; bool -KioskRun::isConfigImmutable(const QString &filename, const QString &group) +KioskRun::isConfigImmutable(const TQString &filename, const TQString &group) { (void) configFile(filename); - ImmutableStatus *status = m_immutableStatusCache.find(filename); + ImmutabletqStatus *status = m_immutableStatusCache.find(filename); assert(status); if (group.isEmpty()) return status->m_fileScope; @@ -361,10 +361,10 @@ KioskRun::isConfigImmutable(const QString &filename, const QString &group) } void -KioskRun::setConfigImmutable(const QString &filename, const QString &_group, bool bImmutable) +KioskRun::setConfigImmutable(const TQString &filename, const TQString &_group, bool bImmutable) { (void) configFile(filename); - ImmutableStatus *status = m_immutableStatusCache.find(filename); + ImmutabletqStatus *status = m_immutableStatusCache.find(filename); assert(status); if (_group.isEmpty()) { @@ -377,7 +377,7 @@ KioskRun::setConfigImmutable(const QString &filename, const QString &_group, boo } else { - QString group = QString("[%1]").arg(_group); + TQString group = TQString("[%1]").tqarg(_group); if (status->m_lines.find(group)) { if (!bImmutable) @@ -399,22 +399,22 @@ KioskRun::setConfigImmutable(const QString &filename, const QString &_group, boo } } -static void stripImmutable(QString &ext) +static void stripImmutable(TQString &ext) { ext.replace("i", ""); if (ext == "[$]") - ext = QString::null; + ext = TQString(); } -static void addImmutable(QString &ext) +static void addImmutable(TQString &ext) { ext.replace("[$", "[$i"); } -QString -KioskRun::saveImmutableStatus(const QString &filename) +TQString +KioskRun::saveImmutabletqStatus(const TQString &filename) { - ImmutableStatus *status = new ImmutableStatus; + ImmutabletqStatus *status = new ImmutabletqStatus; status->m_fileScope = false; status->m_dirty = false; m_immutableStatusCache.insert(filename, status); @@ -422,35 +422,35 @@ KioskRun::saveImmutableStatus(const QString &filename) KTempFile tmp; tmp.close(); - QString newPath = tmp.name(); + TQString newPath = tmp.name(); status->m_tmpFile = tmp.name(); - QString path = m_saveInstance->dirs()->findResource("config", filename); + TQString path = m_saveInstance->dirs()->findResource("config", filename); if (path.isEmpty()) return newPath; // Nothing to do - QFile oldCfg(path); + TQFile oldCfg(path); if (!oldCfg.open( IO_ReadOnly )) return newPath; // Error - QFile newCfg(newPath); + TQFile newCfg(newPath); if (!newCfg.open( IO_WriteOnly )) return newPath; // Error - QTextStream txtIn(&oldCfg); - txtIn.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream txtIn(&oldCfg); + txtIn.setEncoding(TQTextStream::UnicodeUTF8); - QTextStream pTxtOut(&newCfg); - pTxtOut.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream pTxtOut(&newCfg); + pTxtOut.setEncoding(TQTextStream::UnicodeUTF8); - QRegExp immutable("(\\[\\$e?ie?\\])$"); + TQRegExp immutable("(\\[\\$e?ie?\\])$"); // TODO: Use "group+key" instead of "key" as index, otherwise it might not be unique while(! txtIn.atEnd()) { - QString line = txtIn.readLine().stripWhiteSpace(); + TQString line = txtIn.readLine().stripWhiteSpace(); if (line.startsWith("#")) { @@ -461,8 +461,8 @@ KioskRun::saveImmutableStatus(const QString &filename) int pos = immutable.searchRev(line); if (pos != -1) { - QString group = line.left(pos); - QString ext = immutable.cap(0); + TQString group = line.left(pos); + TQString ext = immutable.cap(0); stripImmutable(ext); if (pos == 0) { @@ -478,12 +478,12 @@ KioskRun::saveImmutableStatus(const QString &filename) int equal = line.find('='); if (equal != -1) { - QString key = line.left(equal).stripWhiteSpace(); + TQString key = line.left(equal).stripWhiteSpace(); int pos = immutable.searchRev(key); if (pos != -1) { key = key.left(pos); - QString ext = immutable.cap(0); + TQString ext = immutable.cap(0); stripImmutable(ext); status->m_lines.replace(key, (int *)1 ); line = key + ext + line.mid(equal); @@ -505,23 +505,23 @@ KioskRun::saveImmutableStatus(const QString &filename) } bool -KioskRun::restoreImmutableStatus(const QString &filename, bool force) +KioskRun::restoreImmutabletqStatus(const TQString &filename, bool force) { - ImmutableStatus *status = m_immutableStatusCache.take(filename); + ImmutabletqStatus *status = m_immutableStatusCache.take(filename); if (!status) { - kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") status info missing" << endl; + kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") status info missing" << endl; return true; } if (!force && !status->m_dirty) { - kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") not changed" << endl; + kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") not changed" << endl; delete status; return true; } - kdDebug() << "KioskRun::restoreImmutableStatus(" << filename << ") restoring" << endl; + kdDebug() << "KioskRun::restoreImmutabletqStatus(" << filename << ") restoring" << endl; - QString path = status->m_tmpFile; + TQString path = status->m_tmpFile; KSaveFile newCfg(path); if (newCfg.status() != 0) @@ -530,10 +530,10 @@ KioskRun::restoreImmutableStatus(const QString &filename, bool force) return true; // Continue } - QTextStream *pTxtOut = newCfg.textStream(); - pTxtOut->setEncoding(QTextStream::UnicodeUTF8); + TQTextStream *pTxtOut = newCfg.textStream(); + pTxtOut->setEncoding(TQTextStream::UnicodeUTF8); - QRegExp option("(\\[\\$e\\])$"); + TQRegExp option("(\\[\\$e\\])$"); if (status->m_fileScope) { @@ -541,16 +541,16 @@ KioskRun::restoreImmutableStatus(const QString &filename, bool force) (*pTxtOut) << "[$i]" << endl; } - QFile oldCfg(path); + TQFile oldCfg(path); if (oldCfg.open( IO_ReadOnly )) { - QTextStream txtIn(&oldCfg); - txtIn.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream txtIn(&oldCfg); + txtIn.setEncoding(TQTextStream::UnicodeUTF8); while(! txtIn.atEnd()) { - QString line = txtIn.readLine().stripWhiteSpace(); + TQString line = txtIn.readLine().stripWhiteSpace(); if (line.startsWith("#")) { @@ -566,12 +566,12 @@ KioskRun::restoreImmutableStatus(const QString &filename, bool force) int equal = line.find('='); if (equal != -1) { - QString key = line.left(equal).stripWhiteSpace(); + TQString key = line.left(equal).stripWhiteSpace(); int pos = option.searchRev(key); if (pos != -1) { key = key.left(pos); - QString ext = option.cap(0); + TQString ext = option.cap(0); if (status->m_lines.take(key)) addImmutable(ext); line = key + ext + line.mid(equal); @@ -590,10 +590,10 @@ KioskRun::restoreImmutableStatus(const QString &filename, bool force) } // Create remaining groups that were marked as immutable - QDictIterator<int> it( status->m_lines ); + TQDictIterator<int> it( status->m_lines ); for( ; it.current(); ++it ) { - QString group = it.currentKey(); + TQString group = it.currentKey(); if ( it.current() ) (*pTxtOut) << endl << group << "[$i]" << endl; } @@ -605,7 +605,7 @@ KioskRun::restoreImmutableStatus(const QString &filename, bool force) return true; // Continue } - QString installLocation = m_saveInstance->dirs()->saveLocation("config", QString::null, false) + filename; + TQString installLocation = m_saveInstance->dirs()->saveLocation("config", TQString(), false) + filename; if (!install(path, installLocation)) { m_immutableStatusCache.insert(filename, status); // Keep it around @@ -620,12 +620,12 @@ KioskRun::flushConfigCache() { while ( !m_saveConfigCache.isEmpty() ) { - QDictIterator<KConfig> it( m_saveConfigCache ); - QString file = it.currentKey(); + TQDictIterator<KConfig> it( m_saveConfigCache ); + TQString file = it.currentKey(); KConfig *config = it.current(); bool dirty = config->isDirty(); config->sync(); // Save - if (!restoreImmutableStatus(file, dirty)) + if (!restoreImmutabletqStatus(file, dirty)) return false; m_saveConfigCache.remove(file); } @@ -636,7 +636,7 @@ KioskRun::flushConfigCache() } KConfig * -KioskRun::configFile(const QString &filename) +KioskRun::configFile(const TQString &filename) { KConfig *config = m_saveConfigCache.find(filename); if (config) @@ -646,7 +646,7 @@ KioskRun::configFile(const QString &filename) setupConfigEnv(); - QString saveLocation = saveImmutableStatus(filename); + TQString saveLocation = saveImmutabletqStatus(filename); config = new KSimpleConfig(saveLocation); m_saveConfigCache.insert(filename, config); @@ -669,36 +669,36 @@ KioskRun::makeMutable(bool bMutable) } else { - config->writeEntry("kiosk_exception", QString::null); + config->writeEntry("kiosk_exception", TQString()); } } // Propagate to kdeinit dcopRef("klauncher", "klauncher").call("setLaunchEnv", - QCString("KDE_KIOSK_NO_RESTRICTIONS"), QCString(m_noRestrictions ? "true" : "")); + TQCString("KDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : "")); setConfigImmutable("kdeglobals", "KDE Action Restrictions", true); } -QStringList +TQStringList KioskRun::newConfigFiles() { setupConfigEnv(); - QStringList exceptions; + TQStringList exceptions; exceptions << "kconf_updaterc"; - QStringList result; - QDir dir(m_configDir); - dir.setFilter( QDir::Files | QDir::NoSymLinks ); + TQStringList result; + TQDir dir(m_configDir); + dir.setFilter( TQDir::Files | TQDir::NoSymLinks ); - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return result; - QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { - QString file = fi->fileName(); + TQString file = fi->fileName(); if (!file.endsWith("~") && !exceptions.contains(file)) // Skip backup files & exceptions result.append(file); ++it; @@ -707,20 +707,20 @@ KioskRun::newConfigFiles() } void -KioskRun::mergeConfigFile(const QString &filename) +KioskRun::mergeConfigFile(const TQString &filename) { KConfig *saveCfg = configFile(filename); kdDebug() << "KioskRun::mergeConfigFile(" << (m_configDir + filename) << ")" << endl; KSimpleConfig newCfg(m_configDir + filename); - QStringList groups = newCfg.groupList(); - for(QStringList::ConstIterator it = groups.begin(); + TQStringList groups = newCfg.groupList(); + for(TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it) { saveCfg->setGroup(*it); - QMap<QString, QString> map = newCfg.entryMap(*it); - for(QMap<QString, QString>::Iterator it2 = map.begin(); + TQMap<TQString, TQString> map = newCfg.entryMap(*it); + for(TQMap<TQString, TQString>::Iterator it2 = map.begin(); it2 != map.end(); ++it2) { #ifdef DEBUG_ENTRIES @@ -743,21 +743,21 @@ KioskRun::setupRuntimeEnv() char hostname[256]; hostname[0] = 0; gethostname(hostname, 255); - QString cacheDir = QString("%1/.kde/cache-%2").arg(m_homeDir).arg(hostname); + TQString cacheDir = TQString("%1/.kde/cache-%2").tqarg(m_homeDir).tqarg(hostname); deleteDir(cacheDir); KStandardDirs::makeDir(cacheDir); deleteDir(m_homeDir+"/.qt"); - ::unlink(QFile::encodeName(m_homeDir+".kderc")); + ::unlink(TQFile::encodeName(m_homeDir+".kderc")); - QString iceAuth = QString("%1/.ICEauthority").arg(QDir::homeDirPath()); - setenv("ICEAUTHORITY", QFile::encodeName(iceAuth), 0); // Don't overwrite existing setting + TQString iceAuth = TQString("%1/.ICEauthority").tqarg(TQDir::homeDirPath()); + setenv("ICEAUTHORITY", TQFile::encodeName(iceAuth), 0); // Don't overwrite existing setting - QString xAuth = QString("%1/.Xauthority").arg(QDir::homeDirPath()); - setenv("XAUTHORITY", QFile::encodeName(xAuth), 0); // Don't overwrite existing setting + TQString xAuth = TQString("%1/.Xauthority").tqarg(TQDir::homeDirPath()); + setenv("XAUTHORITY", TQFile::encodeName(xAuth), 0); // Don't overwrite existing setting - QString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; + TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; KProcess kdeinit; @@ -765,18 +765,18 @@ KioskRun::setupRuntimeEnv() kdeinit << "kdeinit"; - connect(&kdeinit, SIGNAL(processExited(KProcess *)), &dlg, SLOT(slotFinished())); + connect(&kdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished())); kdeinit.start(KProcess::NotifyOnExit); dlg.exec(); - QCString dcopSrv; - QFile f(dcopServerFile); + TQCString dcopSrv; + TQFile f(dcopServerFile); if (f.open(IO_ReadOnly)) { - int size = QMIN( 1024, f.size() ); // protection against a huge file - QCString contents( size+1 ); + int size = TQMIN( 1024, f.size() ); // protection against a huge file + TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) == size ) { contents[size] = '\0'; @@ -827,7 +827,7 @@ KioskRun::shutdownRuntimeEnv() } DCOPRef -KioskRun::dcopRef(const QCString &appId, const QCString &objId) +KioskRun::dcopRef(const TQCString &appId, const TQCString &objId) { if (!setupRuntimeEnv()) return DCOPRef(); @@ -838,7 +838,7 @@ KioskRun::dcopRef(const QCString &appId, const QCString &objId) // Lookup the setting for a custom action bool -KioskRun::lookupCustomAction(const QString &action) +KioskRun::lookupCustomAction(const TQString &action) { KConfig *cfg = KioskRun::self()->configFile("kdeglobals"); cfg->setGroup("KDE Custom Restrictions"); @@ -847,7 +847,7 @@ KioskRun::lookupCustomAction(const QString &action) // Change the setting for a custom action void -KioskRun::setCustomAction(const QString &action, bool checked) +KioskRun::setCustomAction(const TQString &action, bool checked) { KConfig *cfg = KioskRun::self()->configFile("kdeglobals"); cfg->setGroup("KDE Custom Restrictions"); @@ -865,9 +865,9 @@ KioskRun::setCustomAction(const QString &action, bool checked) // Create directory bool -KioskRun::createDir(const QString &dir) +KioskRun::createDir(const TQString &dir) { - if (QDir(dir).exists()) + if (TQDir(dir).exists()) return true; // Exists already KURL dest; @@ -897,28 +897,28 @@ KioskRun::createDir(const QString &dir) if (result == true) return true; - QString error = NETACCESS::lastErrorString(); - QString msg; + TQString error = NETACCESS::lastErrorString(); + TQString msg; if (error.isEmpty()) msg = i18n("<qt>The directory <b>%1</b> could not be created because of an unspecified problem.<p>") - .arg(dir); + .tqarg(dir); else msg = i18n("<qt>The directory <b>%1</b> could not be created because of the following problem:" "<p>%2<p>") - .arg(dir, NETACCESS::lastErrorString()); + .tqarg(dir, NETACCESS::lastErrorString()); msg += i18n("Without this directory your changes can not be saved.<p>" "Do you want to retry creating the directory or abort the saving of changes?</qt>"); - int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, QString::null, + int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(), i18n("&Retry"), i18n("&Abort")); if (msgResult == KMessageBox::No) return false; // Maybe the user created it in the meantime - if (QDir(dir).exists()) + if (TQDir(dir).exists()) return true; // Exists already } while (true); @@ -944,13 +944,13 @@ KioskRun::createRemoteDirRecursive(const KURL &dest, bool ask) // Parent doesn't exist, int result = KMessageBox::warningContinueCancel(kapp->mainWidget(), i18n("<qt>The directory <b>%1</b> does not yet exist. " - "Do you want to create it?").arg(parent.prettyURL()), QString::null, + "Do you want to create it?").tqarg(parent.prettyURL()), TQString(), i18n("Create &Dir")); if (result != KMessageBox::Continue) return false; } - QString path = dest.path(1); + TQString path = dest.path(1); int i = 0; while ( (i = path.find('/', i+1)) != -1) { @@ -979,21 +979,21 @@ KioskRun::createRemoteDir(const KURL &dest) #endif //TODO Check directory already exists error - QString error = NETACCESS::lastErrorString(); - QString msg; + TQString error = NETACCESS::lastErrorString(); + TQString msg; if (error.isEmpty()) msg = i18n("<qt>The directory <b>%1</b> could not be created because of an unspecified problem.<p>") - .arg(dest.prettyURL()); + .tqarg(dest.prettyURL()); else msg = i18n("<qt>The directory <b>%1</b> could not be created because of the following problem:" "<p>%2<p>") - .arg(dest.prettyURL(), NETACCESS::lastErrorString()); + .tqarg(dest.prettyURL(), NETACCESS::lastErrorString()); msg += i18n("Without this directory your files can not be uploaded.<p>" "Do you want to retry creating the directory or abort uploading?</qt>"); - int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, QString::null, + int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(), i18n("&Retry"), i18n("&Abort")); if (msgResult == KMessageBox::No) @@ -1005,7 +1005,7 @@ KioskRun::createRemoteDir(const KURL &dest) // Install file bool -KioskRun::install(const QString &file, const QString &destination) +KioskRun::install(const TQString &file, const TQString &destination) { KURL dest; if (!m_isRoot || (m_user != "root")) @@ -1026,23 +1026,23 @@ KioskRun::install(const QString &file, const QString &destination) bool result = NETACCESS::file_copy(src, dest, 0644, true, false, kapp->mainWidget()); if (result == true) { - ::unlink(QFile::encodeName(file)); + ::unlink(TQFile::encodeName(file)); return true; } - QString error = NETACCESS::lastErrorString(); - QString msg; + TQString error = NETACCESS::lastErrorString(); + TQString msg; if (error.isEmpty()) msg = i18n("<qt>The file <b>%1</b> could not be installed because of an unspecified problem.") - .arg(destination); + .tqarg(destination); else msg = i18n("<qt>The file <b>%1</b> could not be installed because of the following problem:" "<p>%2<p>") - .arg(destination, NETACCESS::lastErrorString()); + .tqarg(destination, NETACCESS::lastErrorString()); msg += i18n("Do you want to retry the installation or abort the saving of changes?</qt>"); - int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, QString::null, + int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(), i18n("&Retry"), i18n("&Abort")); if (msgResult == KMessageBox::No) @@ -1054,7 +1054,7 @@ KioskRun::install(const QString &file, const QString &destination) // Upload file bool -KioskRun::uploadRemote(const QString &file, const KURL &dest) +KioskRun::uploadRemote(const TQString &file, const KURL &dest) { do { @@ -1064,19 +1064,19 @@ KioskRun::uploadRemote(const QString &file, const KURL &dest) if (result == true) return true; - QString error = NETACCESS::lastErrorString(); - QString msg; + TQString error = NETACCESS::lastErrorString(); + TQString msg; if (error.isEmpty()) msg = i18n("<qt>The file <b>%1</b> could not be uploaded to <b>%2</b> because of an unspecified problem.") - .arg(file, dest.prettyURL()); + .tqarg(file, dest.prettyURL()); else msg = i18n("<qt>The file <b>%1</b> could not be uploaded to <b>%2</b> because of the following problem:" "<p>%3<p>") - .arg(file, dest.prettyURL(),NETACCESS::lastErrorString()); + .tqarg(file, dest.prettyURL(),NETACCESS::lastErrorString()); msg += i18n("Do you want to retry or abort the uploading?</qt>"); - int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, QString::null, + int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(), i18n("&Retry"), i18n("&Abort")); if (msgResult == KMessageBox::No) @@ -1088,7 +1088,7 @@ KioskRun::uploadRemote(const QString &file, const KURL &dest) // Remove file bool -KioskRun::remove(const QString &destination) +KioskRun::remove(const TQString &destination) { KURL dest; if (!m_isRoot || (m_user != "root")) @@ -1104,7 +1104,7 @@ KioskRun::remove(const QString &destination) // Move file or directory bool -KioskRun::move(const QString &source, const QString &destination, const QStringList &files) +KioskRun::move(const TQString &source, const TQString &destination, const TQStringList &files) { KURL src; KURL dest; @@ -1118,7 +1118,7 @@ KioskRun::move(const QString &source, const QString &destination, const QStringL src.setUser(m_user); } - for(QStringList::ConstIterator it = files.begin(); + for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { src.setPath(source + *it); @@ -1139,32 +1139,32 @@ kdDebug() << "Moving " << src << " --> " << dest << endl; // Read information of profile @p profile void -KioskRun::getProfileInfo(const QString &profile, QString &description, QString &installDir, QString &installUser) +KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQString &installDir, TQString &installUser) { KConfig *config = kapp->config(); - QString defaultInstallDir = getProfilePrefix(); + TQString defaultInstallDir = getProfilePrefix(); if (defaultInstallDir.isEmpty()) { defaultInstallDir = "/etc/kde-profile/"; } if (!defaultInstallDir.endsWith("/")) defaultInstallDir.append("/"); - QString tmp = profile; + TQString tmp = profile; tmp.replace(" ", "_"); tmp.replace(":", "_"); tmp.replace("/", "_"); defaultInstallDir += tmp+"/"; - QString group = QString("Directories-%1").arg(profile); + TQString group = TQString("Directories-%1").tqarg(profile); config->setGroup(group); installDir = config->readEntry("prefixes", defaultInstallDir); if (!installDir.endsWith("/")) installDir.append("/"); - QString profileInfoFile = installDir + ".kdeprofile"; - if (QFile::exists(profileInfoFile)) + TQString profileInfoFile = installDir + ".kdeprofile"; + if (TQFile::exists(profileInfoFile)) { KSimpleConfig profileInfo(profileInfoFile, true); description = profileInfo.readEntry("Description"); @@ -1172,7 +1172,7 @@ KioskRun::getProfileInfo(const QString &profile, QString &description, QString & return; } - QString defaultDescription; + TQString defaultDescription; if (profile == "default") defaultDescription = i18n("Default profile"); @@ -1190,29 +1190,29 @@ KioskRun::openKderc() settingsUrl.setPath(m_kderc); m_localKderc = ::locateLocal("tmp", "kderc_"+kapp->randomString(5)); - ::unlink(QFile::encodeName(m_localKderc)); + ::unlink(TQFile::encodeName(m_localKderc)); KURL localCopyUrl; localCopyUrl.setPath(m_localKderc); - if (QFile::exists(settingsUrl.path())) + if (TQFile::exists(settingsUrl.path())) { while (!NETACCESS::copy(settingsUrl, localCopyUrl, kapp->mainWidget())) { - QString error = NETACCESS::lastErrorString(); - QString msg; + TQString error = NETACCESS::lastErrorString(); + TQString msg; if (error.isEmpty()) msg = i18n("<qt>The file <b>%1</b> could not be accessed because of an unspecified problem.") - .arg(settingsUrl.path()); + .tqarg(settingsUrl.path()); else msg = i18n("<qt>The file <b>%1</b> could not be accessed because of the following problem:" "<p>%2<p>") - .arg(settingsUrl.path(), error); + .tqarg(settingsUrl.path(), error); msg += i18n("Do you want to retry the operation or abort the saving of changes?</qt>"); - int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, QString::null, + int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(), i18n("&Retry"), i18n("&Abort")); if (msgResult == KMessageBox::No) @@ -1233,10 +1233,10 @@ KioskRun::closeKderc() delete m_localKdercConfig; m_localKdercConfig = 0; - QString saveUser = m_user; + TQString saveUser = m_user; m_user = "root"; bool result = install(m_localKderc, m_kderc); - m_localKderc = QString::null; + m_localKderc = TQString(); m_user = saveUser; kapp->config()->reparseConfiguration(); return result; @@ -1244,37 +1244,37 @@ KioskRun::closeKderc() // Store information for profile @p profile bool -KioskRun::setProfileInfo(const QString &profile, const QString &description, const QString &_installDir, const QString &installUser, bool deleteProfile, bool deleteFiles) +KioskRun::setProfileInfo(const TQString &profile, const TQString &description, const TQString &_installDir, const TQString &installUser, bool deleteProfile, bool deleteFiles) { - QString installDir = _installDir; + TQString installDir = _installDir; if (!installDir.endsWith("/")) installDir.append("/"); - QString saveProfileInfo = installDir + ".kdeprofile"; + TQString saveProfileInfo = installDir + ".kdeprofile"; KSimpleConfig profileInfo(saveProfileInfo, true); - QString oldDescription = profileInfo.readEntry("Description"); - QString oldInstallUser = profileInfo.readEntry("InstallUser"); + TQString oldDescription = profileInfo.readEntry("Description"); + TQString oldInstallUser = profileInfo.readEntry("InstallUser"); if (deleteProfile && !installDir.isEmpty()) { bool result = true; KioskSync profileDir(kapp->mainWidget()); profileDir.addDir(installDir, KURL()); - QStringList allFiles = profileDir.listFiles(); + TQStringList allFiles = profileDir.listFiles(); allFiles.remove(".kdeprofile"); if (allFiles.isEmpty()) { - if (QDir(installDir).exists()) + if (TQDir(installDir).exists()) { m_user = installUser; remove(installDir); - m_user = QString::null; + m_user = TQString(); } } else if (deleteFiles) { int msgResult = KMessageBox::warningYesNoCancelList(kapp->mainWidget(), i18n("<qt>The profile directory <b>%1</b> contains the following files, " - "do you wish to delete these files?").arg(installDir), + "do you wish to delete these files?").tqarg(installDir), allFiles, i18n("Deleting Profile"), #if KDE_IS_VERSION(3,2,91) @@ -1290,7 +1290,7 @@ KioskRun::setProfileInfo(const QString &profile, const QString &description, con // Delete files m_user = installUser; result = remove(installDir); - m_user = QString::null; + m_user = TQString(); if (!result) return false; break; @@ -1306,17 +1306,17 @@ KioskRun::setProfileInfo(const QString &profile, const QString &description, con } m_user = installUser; - if (QFile::exists(saveProfileInfo)) + if (TQFile::exists(saveProfileInfo)) result = remove(saveProfileInfo); - m_user = QString::null; + m_user = TQString(); if (!result) return false; } else if ((description != oldDescription) || (installUser != oldInstallUser)) { - QString localProfileInfo = ::locateLocal("tmp", "kdeprofile_"+kapp->randomString(5)); - ::unlink(QFile::encodeName(localProfileInfo)); + TQString localProfileInfo = ::locateLocal("tmp", "kdeprofile_"+kapp->randomString(5)); + ::unlink(TQFile::encodeName(localProfileInfo)); KSimpleConfig newProfileInfo(localProfileInfo); newProfileInfo.writeEntry("Description", description); newProfileInfo.writeEntry("InstallUser", installUser); @@ -1327,14 +1327,14 @@ KioskRun::setProfileInfo(const QString &profile, const QString &description, con } KUser thisUser; - QString newAdmin = thisUser.loginName()+":"; // This user, all hosts + TQString newAdmin = thisUser.loginName()+":"; // This user, all hosts KConfig *config = kapp->config(); config->setGroup("Directories"); - QString oldAdmin = config->readEntry("kioskAdmin"); + TQString oldAdmin = config->readEntry("kioskAdmin"); - QString group = QString("Directories-%1").arg(profile); + TQString group = TQString("Directories-%1").tqarg(profile); config->setGroup(group); if ((installDir == config->readEntry("prefixes")) && @@ -1365,24 +1365,24 @@ KioskRun::setProfileInfo(const QString &profile, const QString &description, con } bool -KioskRun::deleteProfile(const QString &profile, bool deleteFiles) +KioskRun::deleteProfile(const TQString &profile, bool deleteFiles) { - QString description; - QString installDir; - QString installUser; + TQString description; + TQString installDir; + TQString installUser; getProfileInfo(profile, description, installDir, installUser); return setProfileInfo(profile, description, installDir, installUser, true, deleteFiles); } // Read profile prefix -QString +TQString KioskRun::getProfilePrefix() { KConfig *config = kapp->config(); config->setGroup("Directories"); - QString prefix = config->readEntry("profileDirsPrefix"); + TQString prefix = config->readEntry("profileDirsPrefix"); if (!prefix.isEmpty() && !prefix.endsWith("/")) prefix.append('/'); return prefix; @@ -1390,9 +1390,9 @@ KioskRun::getProfilePrefix() // Store profile prefix bool -KioskRun::setProfilePrefix(const QString &_prefix) +KioskRun::setProfilePrefix(const TQString &_prefix) { - QString prefix = _prefix; + TQString prefix = _prefix; if (!prefix.isEmpty() && !prefix.endsWith("/")) prefix.append('/'); @@ -1412,62 +1412,62 @@ KioskRun::setProfilePrefix(const QString &_prefix) return closeKderc(); } -QString +TQString KioskRun::newProfile() { - QString profilePrefix = getProfilePrefix(); + TQString profilePrefix = getProfilePrefix(); KConfig *config = kapp->config(); for(int p = 1; p; p++) { - QString profile = QString("profile%1").arg(p); - QString group = QString("Directories-%1").arg(profile); + TQString profile = TQString("profile%1").tqarg(p); + TQString group = TQString("Directories-%1").tqarg(profile); if (!config->hasGroup(group)) { if (profilePrefix.isEmpty()) return profile; - QString profileDir = profilePrefix + profile; - if (!QDir(profileDir).exists() && !QFile::exists(profileDir)) + TQString profileDir = profilePrefix + profile; + if (!TQDir(profileDir).exists() && !TQFile::exists(profileDir)) return profile; // Keep on looking... } } - return QString::null; + return TQString(); } -QStringList +TQStringList KioskRun::allProfiles() { KConfig *config = kapp->config(); - QStringList groups = config->groupList(); - QStringList profiles; - QStringList directories; - for(QStringList::ConstIterator it = groups.begin(); + TQStringList groups = config->groupList(); + TQStringList profiles; + TQStringList directories; + for(TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it) { if (!(*it).startsWith("Directories-")) continue; profiles.append((*it).mid(12)); config->setGroup(*it); - QString installDir = config->readEntry("prefixes"); + TQString installDir = config->readEntry("prefixes"); if (!installDir.endsWith("/")) installDir.append("/"); directories.append(installDir); } - QString profilePrefix = getProfilePrefix(); + TQString profilePrefix = getProfilePrefix(); if (!profilePrefix.isEmpty()) { - QDir dir(profilePrefix, QString::null, QDir::Unsorted, QDir::Dirs); - QStringList profileDirs = dir.entryList(); - for(QStringList::ConstIterator it = profileDirs.begin(); + TQDir dir(profilePrefix, TQString(), TQDir::Unsorted, TQDir::Dirs); + TQStringList profileDirs = dir.entryList(); + for(TQStringList::ConstIterator it = profileDirs.begin(); it != profileDirs.end(); ++it) { if ((*it).startsWith(".")) continue; - QString dir = profilePrefix + *it + "/"; + TQString dir = profilePrefix + *it + "/"; if (directories.contains(dir)) { kdDebug() << "Skipping " << dir << ", dir already listed" << endl; @@ -1479,7 +1479,7 @@ KioskRun::allProfiles() continue; } - if (!QFile::exists(dir+".kdeprofile")) + if (!TQFile::exists(dir+".kdeprofile")) { kdDebug() << "Skipping " << dir << ", no profile info" << endl; continue; @@ -1496,16 +1496,16 @@ KioskRun::allProfiles() } void -KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users, QStringList &groupOrder) +KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users, TQStringList &groupOrder) { groups.clear(); users.clear(); KConfig *config = kapp->config(); config->setGroup("Directories"); - QString mapFile = config->readEntry("userProfileMapFile"); + TQString mapFile = config->readEntry("userProfileMapFile"); - if (mapFile.isEmpty() || !QFile::exists(mapFile)) + if (mapFile.isEmpty() || !TQFile::exists(mapFile)) return; KSimpleConfig mapCfg(mapFile, true); @@ -1514,32 +1514,32 @@ KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users, groupOrder = mapCfg.readListEntry("groups"); mapCfg.setGroup("Groups"); - for ( QStringList::ConstIterator it = groupOrder.begin(); + for ( TQStringList::ConstIterator it = groupOrder.begin(); it != groupOrder.end(); ++it ) { - QString group = *it; - QStringList profiles = mapCfg.readListEntry(group); + TQString group = *it; + TQStringList profiles = mapCfg.readListEntry(group); if (!profiles.isEmpty()) groups.insert(group, profiles); } - QMap<QString, QString> cfg_users = mapCfg.entryMap("Users"); - for ( QMap<QString, QString>::Iterator it = cfg_users.begin(); + TQMap<TQString, TQString> cfg_users = mapCfg.entryMap("Users"); + for ( TQMap<TQString, TQString>::Iterator it = cfg_users.begin(); it != cfg_users.end(); ++it ) { - QString user = it.key(); - QStringList profiles = QStringList::split(",", it.data()); + TQString user = it.key(); + TQStringList profiles = TQStringList::split(",", it.data()); if (!profiles.isEmpty()) users.insert(user, profiles); } } bool -KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMapping &users, const QStringList &groupOrder) +KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMapping &users, const TQStringList &groupOrder) { KConfig *config = kapp->config(); config->setGroup("Directories"); - QString mapFile = config->readEntry("userProfileMapFile"); + TQString mapFile = config->readEntry("userProfileMapFile"); if (mapFile.isEmpty()) { mapFile = "/etc/kde-user-profile"; @@ -1554,8 +1554,8 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap return false; } - QString localMapFile = ::locateLocal("tmp", "kde-user-profile_"+kapp->randomString(5)); - ::unlink(QFile::encodeName(localMapFile)); + TQString localMapFile = ::locateLocal("tmp", "kde-user-profile_"+kapp->randomString(5)); + ::unlink(TQFile::encodeName(localMapFile)); KSimpleConfig mapConfig(localMapFile); @@ -1567,19 +1567,19 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap mapConfig.setGroup("Groups"); for ( it = groups.begin(); it != groups.end(); ++it ) { - QString group = it.key(); + TQString group = it.key(); mapConfig.writeEntry(group, it.data()); } mapConfig.setGroup("Users"); for ( it = users.begin(); it != users.end(); ++it ) { - QString user = it.key(); + TQString user = it.key(); mapConfig.writeEntry(user, it.data()); } mapConfig.sync(); - QString saveUser = m_user; + TQString saveUser = m_user; m_user = "root"; bool result = install(localMapFile, mapFile); m_user = saveUser; @@ -1592,7 +1592,7 @@ KioskRun::forceSycocaUpdate() // Touch $KDEDIR/share/services/update_ksycoca KTempFile tempFile; tempFile.close(); - QString sycocaUpdateFile = locateSave("services", "update_ksycoca"); + TQString sycocaUpdateFile = locateSave("services", "update_ksycoca"); remove(sycocaUpdateFile); install(tempFile.name(), sycocaUpdateFile); } @@ -1606,24 +1606,24 @@ KioskRun::scheduleSycocaUpdate() void KioskRun::setCustomRestrictionFileBrowsing(bool restrict) { - QString file = "kdeglobals"; - QString group = "KDE URL Restrictions"; + TQString file = "kdeglobals"; + TQString group = "KDE URL Restrictions"; KConfig *cfg = KioskRun::self()->configFile(file); cfg->setGroup(group); int count = cfg->readNumEntry("rule_count"); - QStringList urlRestrictions; + TQStringList urlRestrictions; for(int i = 0; i < count; i++) { - QString key = QString("rule_%1").arg(i+1); + TQString key = TQString("rule_%1").tqarg(i+1); if (cfg->hasKey(key)) urlRestrictions.append(cfg->readEntry(key)); } - QStringList newRestrictions; + TQStringList newRestrictions; newRestrictions << "list,,,,file,,,false"; newRestrictions << "list,,,,file,,$HOME,true"; - for(QStringList::ConstIterator it = newRestrictions.begin(); + for(TQStringList::ConstIterator it = newRestrictions.begin(); it != newRestrictions.end(); ++it) { urlRestrictions.remove(*it); @@ -1640,17 +1640,17 @@ KioskRun::setCustomRestrictionFileBrowsing(bool restrict) for(int i = 0; i < count; i++) { - QString key = QString("rule_%1").arg(i+1); + TQString key = TQString("rule_%1").tqarg(i+1); cfg->writeEntry(key, urlRestrictions[i]); } KioskRun::self()->setConfigImmutable(file, group, true); } -KioskRunProgressDialog::KioskRunProgressDialog(QWidget *parent, const char *name, - const QString &caption, const QString &text) +KioskRunProgressDialog::KioskRunProgressDialog(TQWidget *parent, const char *name, + const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotProgress())); + connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -1679,7 +1679,7 @@ KioskRunProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - QTimer::singleShot(1000, this, SLOT(close())); + TQTimer::singleShot(1000, this, TQT_SLOT(close())); } |