From 1970df5bb461eff586a2a099ae0c020bdcd550b7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:13 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit f97153cfb212e0b3feb8c8f1c6376b89c747a9a9. --- kiosktool/componentPage.cpp | 14 ++--- kiosktool/componentPage_ui.ui | 18 +++--- kiosktool/componentSelectionPage_ui.ui | 10 +-- kiosktool/kcms/autostart/kcmautostart.cpp | 6 +- kiosktool/kioskConfigDialog.cpp | 4 +- kiosktool/kioskConfigDialog_ui.ui | 22 +++---- kiosktool/kioskdata.cpp | 6 +- kiosktool/kioskgui.cpp | 10 +-- kiosktool/kioskrun.cpp | 74 +++++++++++------------ kiosktool/kioskrun.h | 8 +-- kiosktool/kiosksync.cpp | 4 +- kiosktool/kiosktool-tdedirs.cpp | 2 +- kiosktool/mainview.ui | 18 +++--- kiosktool/profilePropsPage.cpp | 4 +- kiosktool/profilePropsPage_ui.ui | 18 +++--- kiosktool/profileSelectionPage_ui.ui | 16 ++--- kiosktool/userManagement.cpp | 18 +++--- kiosktool/userManagementGroup_ui.ui | 8 +-- kiosktool/userManagementUser_ui.ui | 8 +-- kiosktool/userManagement_ui.ui | 16 ++--- 20 files changed, 142 insertions(+), 142 deletions(-) diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp index 7d47032..0b519e0 100644 --- a/kiosktool/componentPage.cpp +++ b/kiosktool/componentPage.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -47,8 +47,8 @@ ComponentPage::ComponentPage( ComponentData *data, Component *component, TQWidge connect(pbSetup, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetup())); connect(pbPreview, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreview())); - pbSetup->setText(i18n("&Setup %1").arg(m_data->caption)); - pbPreview->setText(i18n("&Preview %1").arg(m_data->caption)); + pbSetup->setText(i18n("&Setup %1").tqarg(m_data->caption)); + pbPreview->setText(i18n("&Preview %1").tqarg(m_data->caption)); if (m_data->preview.exec.isEmpty()) pbPreview->hide(); @@ -103,7 +103,7 @@ void ComponentPage::setFocus() TQString ComponentPage::subCaption() { - return i18n("Setup %1").arg(m_data->caption); + return i18n("Setup %1").tqarg(m_data->caption); } void ComponentPage::slotSetup() @@ -154,7 +154,7 @@ void ComponentPage::slotSetup() int result = KMessageBox::questionYesNo(this, i18n("You can now configure %1. " "When you are finished click Save to make the new configuration permanent.") - .arg(m_data->caption), i18n("%1 Setup").arg(m_data->caption), + .tqarg(m_data->caption), i18n("%1 Setup").tqarg(m_data->caption), KStdGuiItem::save(), KStdGuiItem::discard()); m_saveSettings = (result == KMessageBox::Yes); if (!dcopApp.isEmpty()) @@ -254,7 +254,7 @@ void ComponentPage::slotPreview() i18n("This is how %1 will behave and look with the new settings. " "Any changes you now make to the settings will not be saved.

" "Click Ok to return to your own personal %2 configuration.") - .arg(m_data->caption, m_data->caption), i18n("%1 Preview").arg(m_data->caption)); + .tqarg(m_data->caption, m_data->caption), i18n("%1 Preview").tqarg(m_data->caption)); if (!dcopApp.isEmpty()) KioskRun::self()->dcopRef(dcopApp, dcopObj).call("quit"); diff --git a/kiosktool/componentPage_ui.ui b/kiosktool/componentPage_ui.ui index de3e060..bc4c6c1 100644 --- a/kiosktool/componentPage_ui.ui +++ b/kiosktool/componentPage_ui.ui @@ -23,13 +23,13 @@ componentDescription - + 0 140 - + 32767 140 @@ -41,7 +41,7 @@ Sunken - + WordBreak|AlignTop @@ -55,7 +55,7 @@ Fixed - + 20 16 @@ -64,7 +64,7 @@ - layout1 + tqlayout1 @@ -88,7 +88,7 @@ Fixed - + 20 16 @@ -113,7 +113,7 @@ Expanding - + 21 171 @@ -132,7 +132,7 @@ Fixed - + 16 20 @@ -162,7 +162,7 @@ 1 - + 300 150 diff --git a/kiosktool/componentSelectionPage_ui.ui b/kiosktool/componentSelectionPage_ui.ui index be874a4..6069bda 100644 --- a/kiosktool/componentSelectionPage_ui.ui +++ b/kiosktool/componentSelectionPage_ui.ui @@ -29,7 +29,7 @@ Fixed - + 20 20 @@ -46,7 +46,7 @@ Fixed - + 20 20 @@ -55,7 +55,7 @@ - layout1 + tqlayout1 @@ -79,7 +79,7 @@ Expanding - + 20 211 @@ -100,7 +100,7 @@ 0 - + 400 200 diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp index 1b4638a..9866a94 100644 --- a/kiosktool/kcms/autostart/kcmautostart.cpp +++ b/kiosktool/kcms/autostart/kcmautostart.cpp @@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include @@ -88,7 +88,7 @@ void setModuleGroup(KConfig *config, const TQString &filename) if (i != -1) module = module.left(i); - config->setGroup(TQString("Module-%1").arg(module)); + config->setGroup(TQString("Module-%1").tqarg(module)); } bool AutoStartConfig::autoloadEnabled(KConfig *config, const TQString &filename) @@ -106,7 +106,7 @@ void AutoStartConfig::setAutoloadEnabled(KConfig *config, const TQString &filena void AutoStartConfig::load() { _lvStartup->clear(); - TQStringList files = KGlobal::dirs()->findAllResources( "autostart", TQString::fromLatin1( "*.desktop" ), false, true ); + TQStringList files = KGlobal::dirs()->findAllResources( "autostart", TQString::tqfromLatin1( "*.desktop" ), false, true ); for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); it++ ) { diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp index 765289e..7111e5f 100644 --- a/kiosktool/kioskConfigDialog.cpp +++ b/kiosktool/kioskConfigDialog.cpp @@ -20,7 +20,7 @@ #include "kioskConfigDialog.h" #include -#include +#include #include #include @@ -113,7 +113,7 @@ void KioskConfigDialog::updateExample() if (!url.endsWith("/")) url += "/"; url += file2; - TQString example = TQString("

%1
-->
%2
").arg(file1, url); + TQString example = TQString("
%1
-->
%2
").tqarg(file1, url); w->lblUploadExample->setText(example); w->lblUploadExample->setFixedSize(TQSize(500,fontMetrics().lineSpacing()*3 + 6)); } diff --git a/kiosktool/kioskConfigDialog_ui.ui b/kiosktool/kioskConfigDialog_ui.ui index 64d2753..0bb5ef2 100644 --- a/kiosktool/kioskConfigDialog_ui.ui +++ b/kiosktool/kioskConfigDialog_ui.ui @@ -26,7 +26,7 @@ - layout3 + tqlayout3 @@ -42,7 +42,7 @@ Fixed - + 20 20 @@ -51,7 +51,7 @@ - layout2 + tqlayout2 @@ -90,7 +90,7 @@ - layout8 + tqlayout8 @@ -106,7 +106,7 @@ Fixed - + 16 20 @@ -115,7 +115,7 @@ - layout7 + tqlayout7 @@ -179,7 +179,7 @@ 0 - + 500 10 @@ -215,7 +215,7 @@ - layout6 + tqlayout6 @@ -231,7 +231,7 @@ Fixed - + 20 20 @@ -259,7 +259,7 @@ Expanding - + 60 20 @@ -278,7 +278,7 @@ Expanding - + 20 20 diff --git a/kiosktool/kioskdata.cpp b/kiosktool/kioskdata.cpp index df6fdae..135c8f2 100644 --- a/kiosktool/kioskdata.cpp +++ b/kiosktool/kioskdata.cpp @@ -51,7 +51,7 @@ static TQDict *readStdActionCaptions() TQString caption = action->text(); caption.replace("&",""); - captions->insert(TQString::fromLatin1(action->name()), new TQString(caption)); + captions->insert(TQString::tqfromLatin1(action->name()), new TQString(caption)); } return captions; } @@ -267,7 +267,7 @@ bool KioskData::load() TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) { - m_errorMsg = i18n("Could not open %1").arg(filename); + m_errorMsg = i18n("Could not open %1").tqarg(filename); return false; } @@ -276,7 +276,7 @@ bool KioskData::load() int errorCol; if ( !doc.setContent( &file, &errorMsg, &errorRow, &errorCol ) ) { - m_errorMsg = i18n("Syntax error in %1
Line %3, column %4: %2").arg(filename, errorMsg).arg(errorRow).arg(errorCol); + m_errorMsg = i18n("Syntax error in %1
Line %3, column %4: %2").tqarg(filename, errorMsg).tqarg(errorRow).tqarg(errorCol); file.close(); return false; } diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp index afdc190..2f1e75e 100644 --- a/kiosktool/kioskgui.cpp +++ b/kiosktool/kioskgui.cpp @@ -126,7 +126,7 @@ void KioskGui::slotCheckEtcSkel() "If this is not the intended behavior, please remove the offending " "files from the skeleton folder on all systems that you want to " "administer with user profiles.

" - "The following files were found under %2:").arg(etcSkel).arg(etcSkel), + "The following files were found under %2:").tqarg(etcSkel).tqarg(etcSkel), skelFiles, TQString(), "etc_skel_warning"); @@ -234,7 +234,7 @@ void KioskGui::slotDeleteProfile(TQListViewItem *item) TQString profile = item->text(0); int result = KMessageBox::warningContinueCancel(this, i18n("You are about to delete the profile %1.

" - "Are you sure you want to do this?").arg(profile), + "Are you sure you want to do this?").tqarg(profile), TQString(), KGuiItem(i18n("Delete"),"editdelete")); if (result == KMessageBox::Continue) { @@ -376,7 +376,7 @@ void KioskGui::selectPage(int page, bool save) setCaption(i18n("Profile Properties")); break; case PAGE_COMPONENT_SELECTION: - setSubCaption(i18n("Setup Profile \"%1\"").arg(m_profile)); + setSubCaption(i18n("Setup Profile \"%1\"").tqarg(m_profile)); setCaption(m_profile); break; case PAGE_COMPONENT: @@ -635,7 +635,7 @@ bool KioskGui::queryClose() KURL uploadUrl = config->readEntry("uploadURL"); int result = KMessageBox::questionYesNo(this, - i18n("Do you want to upload the profiles to %1 ?").arg(uploadUrl.prettyURL())); + i18n("Do you want to upload the profiles to %1 ?").tqarg(uploadUrl.prettyURL())); if (result == KMessageBox::Yes) { uploadAllProfiles(); @@ -681,7 +681,7 @@ void KioskGui::uploadAllProfiles() if (sync.sync()) { - KMessageBox::information(this, i18n("All profiles have been successfully uploaded to %1").arg(uploadURL)); + KMessageBox::information(this, i18n("All profiles have been successfully uploaded to %1").tqarg(uploadURL)); } } diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index ff58cde..8164dc8 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -264,17 +264,17 @@ KioskRun::setupConfigEnv() hostname[0] = 0; gethostname(hostname, 255); - TQString tmpDir = TQString("%1/%2-%3").arg(kdeHome).arg("tmp").arg(hostname); + TQString tmpDir = TQString("%1/%2-%3").tqarg(kdeHome).tqarg("tmp").tqarg(hostname); deleteDir(tmpDir); ::mkdir(TQFile::encodeName(newTmpDir), 0700); ::symlink(TQFile::encodeName(newTmpDir), TQFile::encodeName(tmpDir)); - TQString socketDir = TQString("%1/%2-%3").arg(kdeHome).arg("socket").arg(hostname); + TQString socketDir = TQString("%1/%2-%3").tqarg(kdeHome).tqarg("socket").tqarg(hostname); deleteDir(socketDir); ::mkdir(TQFile::encodeName(newSocketDir), 0700); ::symlink(TQFile::encodeName(newSocketDir), TQFile::encodeName(socketDir)); - m_configDir = TQString("%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 @@ -338,7 +338,7 @@ KioskRun::shutdownConfigEnv() m_instance = 0; } -class ImmutableStatus +class ImmutabletqStatus { public: bool m_fileScope; @@ -352,7 +352,7 @@ bool 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; @@ -364,7 +364,7 @@ void 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 TQString &filename, const TQString &_group, b } else { - TQString group = TQString("[%1]").arg(_group); + TQString group = TQString("[%1]").tqarg(_group); if (status->m_lines.find(group)) { if (!bImmutable) @@ -412,9 +412,9 @@ static void addImmutable(TQString &ext) } TQString -KioskRun::saveImmutableStatus(const TQString &filename) +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); @@ -505,21 +505,21 @@ KioskRun::saveImmutableStatus(const TQString &filename) } bool -KioskRun::restoreImmutableStatus(const TQString &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; TQString path = status->m_tmpFile; @@ -625,7 +625,7 @@ KioskRun::flushConfigCache() 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); } @@ -646,7 +646,7 @@ KioskRun::configFile(const TQString &filename) setupConfigEnv(); - TQString saveLocation = saveImmutableStatus(filename); + TQString saveLocation = saveImmutabletqStatus(filename); config = new KSimpleConfig(saveLocation); m_saveConfigCache.insert(filename, config); @@ -743,7 +743,7 @@ KioskRun::setupRuntimeEnv() char hostname[256]; hostname[0] = 0; gethostname(hostname, 255); - TQString cacheDir = TQString("%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); @@ -751,10 +751,10 @@ KioskRun::setupRuntimeEnv() ::unlink(TQFile::encodeName(m_homeDir+".kderc")); - TQString iceAuth = TQString("%1/.ICEauthority").arg(TQDir::homeDirPath()); + TQString iceAuth = TQString("%1/.ICEauthority").tqarg(TQDir::homeDirPath()); setenv("ICEAUTHORITY", TQFile::encodeName(iceAuth), 0); // Don't overwrite existing setting - TQString xAuth = TQString("%1/.Xauthority").arg(TQDir::homeDirPath()); + TQString xAuth = TQString("%1/.Xauthority").tqarg(TQDir::homeDirPath()); setenv("XAUTHORITY", TQFile::encodeName(xAuth), 0); // Don't overwrite existing setting TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; @@ -902,11 +902,11 @@ KioskRun::createDir(const TQString &dir) if (error.isEmpty()) msg = i18n("The directory %1 could not be created because of an unspecified problem.

") - .arg(dir); + .tqarg(dir); else msg = i18n("The directory %1 could not be created because of the following problem:" "

%2

") - .arg(dir, NETACCESS::lastErrorString()); + .tqarg(dir, NETACCESS::lastErrorString()); msg += i18n("Without this directory your changes can not be saved.

" "Do you want to retry creating the directory or abort the saving of changes?"); @@ -944,7 +944,7 @@ KioskRun::createRemoteDirRecursive(const KURL &dest, bool ask) // Parent doesn't exist, int result = KMessageBox::warningContinueCancel(kapp->mainWidget(), i18n("The directory %1 does not yet exist. " - "Do you want to create it?").arg(parent.prettyURL()), TQString(), + "Do you want to create it?").tqarg(parent.prettyURL()), TQString(), i18n("Create &Dir")); if (result != KMessageBox::Continue) return false; @@ -984,11 +984,11 @@ KioskRun::createRemoteDir(const KURL &dest) if (error.isEmpty()) msg = i18n("The directory %1 could not be created because of an unspecified problem.

") - .arg(dest.prettyURL()); + .tqarg(dest.prettyURL()); else msg = i18n("The directory %1 could not be created because of the following problem:" "

%2

") - .arg(dest.prettyURL(), NETACCESS::lastErrorString()); + .tqarg(dest.prettyURL(), NETACCESS::lastErrorString()); msg += i18n("Without this directory your files can not be uploaded.

" "Do you want to retry creating the directory or abort uploading?"); @@ -1034,11 +1034,11 @@ KioskRun::install(const TQString &file, const TQString &destination) TQString msg; if (error.isEmpty()) msg = i18n("The file %1 could not be installed because of an unspecified problem.") - .arg(destination); + .tqarg(destination); else msg = i18n("The file %1 could not be installed because of the following problem:" "

%2

") - .arg(destination, NETACCESS::lastErrorString()); + .tqarg(destination, NETACCESS::lastErrorString()); msg += i18n("Do you want to retry the installation or abort the saving of changes?"); @@ -1068,11 +1068,11 @@ KioskRun::uploadRemote(const TQString &file, const KURL &dest) TQString msg; if (error.isEmpty()) msg = i18n("The file %1 could not be uploaded to %2 because of an unspecified problem.") - .arg(file, dest.prettyURL()); + .tqarg(file, dest.prettyURL()); else msg = i18n("The file %1 could not be uploaded to %2 because of the following problem:" "

%3

") - .arg(file, dest.prettyURL(),NETACCESS::lastErrorString()); + .tqarg(file, dest.prettyURL(),NETACCESS::lastErrorString()); msg += i18n("Do you want to retry or abort the uploading?"); @@ -1156,7 +1156,7 @@ KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQStrin tmp.replace("/", "_"); defaultInstallDir += tmp+"/"; - TQString group = TQString("Directories-%1").arg(profile); + TQString group = TQString("Directories-%1").tqarg(profile); config->setGroup(group); installDir = config->readEntry("prefixes", defaultInstallDir); @@ -1204,11 +1204,11 @@ KioskRun::openKderc() TQString msg; if (error.isEmpty()) msg = i18n("The file %1 could not be accessed because of an unspecified problem.") - .arg(settingsUrl.path()); + .tqarg(settingsUrl.path()); else msg = i18n("The file %1 could not be accessed because of the following problem:" "

%2

") - .arg(settingsUrl.path(), error); + .tqarg(settingsUrl.path(), error); msg += i18n("Do you want to retry the operation or abort the saving of changes?"); @@ -1274,7 +1274,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c { int msgResult = KMessageBox::warningYesNoCancelList(kapp->mainWidget(), i18n("The profile directory %1 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) @@ -1334,7 +1334,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c config->setGroup("Directories"); TQString oldAdmin = config->readEntry("kioskAdmin"); - TQString group = TQString("Directories-%1").arg(profile); + TQString group = TQString("Directories-%1").tqarg(profile); config->setGroup(group); if ((installDir == config->readEntry("prefixes")) && @@ -1420,8 +1420,8 @@ KioskRun::newProfile() KConfig *config = kapp->config(); for(int p = 1; p; p++) { - TQString profile = TQString("profile%1").arg(p); - TQString group = TQString("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()) @@ -1614,7 +1614,7 @@ KioskRun::setCustomRestrictionFileBrowsing(bool restrict) TQStringList urlRestrictions; for(int i = 0; i < count; i++) { - TQString key = TQString("rule_%1").arg(i+1); + TQString key = TQString("rule_%1").tqarg(i+1); if (cfg->hasKey(key)) urlRestrictions.append(cfg->readEntry(key)); } @@ -1640,7 +1640,7 @@ KioskRun::setCustomRestrictionFileBrowsing(bool restrict) for(int i = 0; i < count; i++) { - TQString key = TQString("rule_%1").arg(i+1); + TQString key = TQString("rule_%1").tqarg(i+1); cfg->writeEntry(key, urlRestrictions[i]); } KioskRun::self()->setConfigImmutable(file, group, true); diff --git a/kiosktool/kioskrun.h b/kiosktool/kioskrun.h index 0a11815..dcd114f 100644 --- a/kiosktool/kioskrun.h +++ b/kiosktool/kioskrun.h @@ -30,7 +30,7 @@ #include -class ImmutableStatus; +class ImmutabletqStatus; class KConfig; class KProcess; class KSimpleConfig; @@ -182,8 +182,8 @@ protected: void shutdownConfigEnv(); void applyEnvironment(KProcess *p); - TQString saveImmutableStatus(const TQString &filename); - bool restoreImmutableStatus(const TQString &filename, bool force); + TQString saveImmutabletqStatus(const TQString &filename); + bool restoreImmutabletqStatus(const TQString &filename, bool force); void setCustomRestrictionFileBrowsing(bool restrict); @@ -200,7 +200,7 @@ private: KInstance *m_instance; KInstance *m_saveInstance; TQDict m_saveConfigCache; - TQDict m_immutableStatusCache; + TQDict m_immutableStatusCache; bool m_noRestrictions; bool m_forceSycocaUpdate; bool m_isRoot; diff --git a/kiosktool/kiosksync.cpp b/kiosktool/kiosksync.cpp index 3f20044..4fc0b8c 100644 --- a/kiosktool/kiosksync.cpp +++ b/kiosktool/kiosksync.cpp @@ -150,12 +150,12 @@ KioskSync::scanChangedFiles(const TQString &_dir, const TQString &prefix) TQDir dir(_dir); if (!dir.exists()) { - emit warning(i18n("Directory %1 does not exist.").arg(_dir)); + emit warning(i18n("Directory %1 does not exist.").tqarg(_dir)); return; } if (!dir.isReadable()) { - emit warning(i18n("Directory %1 is not readable.").arg(_dir)); + emit warning(i18n("Directory %1 is not readable.").tqarg(_dir)); return; } diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp index 43d4fed..47d8ee2 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::fromLatin1("Directories-%1").arg(profile)); + config->setGroup(TQString::tqfromLatin1("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 9cd33c8..e08f69a 100644 --- a/kiosktool/mainview.ui +++ b/kiosktool/mainview.ui @@ -31,7 +31,7 @@ 0 - + 0 70 @@ -56,7 +56,7 @@ 0 - + 160 170 @@ -84,7 +84,7 @@ Plain - + AlignCenter @@ -98,7 +98,7 @@ Fixed - + 25 20 @@ -115,7 +115,7 @@ Fixed - + 25 20 @@ -124,7 +124,7 @@ - layout4 + tqlayout4 @@ -191,7 +191,7 @@ Expanding - + 20 20 @@ -216,7 +216,7 @@ Expanding - + 20 20 @@ -245,7 +245,7 @@ Fixed - + 160 20 diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp index 97ca85d..4396218 100644 --- a/kiosktool/profilePropsPage.cpp +++ b/kiosktool/profilePropsPage.cpp @@ -150,7 +150,7 @@ bool ProfilePropsPage::save() if (!userInfo.isValid()) { KMessageBox::sorry(this, - i18n("The user %1 is not an existing user.").arg(user)); + i18n("The user %1 is not an existing user.").tqarg(user)); comboUser->setFocus(); return false; } @@ -182,7 +182,7 @@ bool ProfilePropsPage::save() i18n("The directory for this profile has changed " "from %1 to %2.

" "The following files under %3 will be moved to %4") - .arg(m_origInstallDir, installDir, m_origInstallDir, installDir), + .tqarg(m_origInstallDir, installDir, m_origInstallDir, installDir), fileList, i18n("Profile Directory Changed")); if (msgResult != KMessageBox::Continue) diff --git a/kiosktool/profilePropsPage_ui.ui b/kiosktool/profilePropsPage_ui.ui index 96043b2..32a50f8 100644 --- a/kiosktool/profilePropsPage_ui.ui +++ b/kiosktool/profilePropsPage_ui.ui @@ -29,7 +29,7 @@ Expanding - + 16 20 @@ -46,7 +46,7 @@ Expanding - + 60 20 @@ -88,7 +88,7 @@ editProfileName - + 400 0 @@ -105,7 +105,7 @@ Fixed - + 20 20 @@ -130,7 +130,7 @@ editDescription - + 400 0 @@ -147,7 +147,7 @@ Fixed - + 20 20 @@ -183,7 +183,7 @@ Fixed - + 20 20 @@ -208,7 +208,7 @@ kurlInstallDir - + 400 0 @@ -235,7 +235,7 @@ Expanding - + 20 30 diff --git a/kiosktool/profileSelectionPage_ui.ui b/kiosktool/profileSelectionPage_ui.ui index 203734f..f78200c 100644 --- a/kiosktool/profileSelectionPage_ui.ui +++ b/kiosktool/profileSelectionPage_ui.ui @@ -32,7 +32,7 @@ Fixed - + 20 20 @@ -73,7 +73,7 @@ 1 - + 300 220 @@ -99,7 +99,7 @@ Fixed - + 20 20 @@ -108,7 +108,7 @@ - layout3 + tqlayout3 @@ -132,7 +132,7 @@ Fixed - + 20 10 @@ -157,7 +157,7 @@ Fixed - + 20 10 @@ -182,7 +182,7 @@ MinimumExpanding - + 20 40 @@ -207,7 +207,7 @@ Fixed - + 20 10 diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp index 697a37a..2cca956 100644 --- a/kiosktool/userManagement.cpp +++ b/kiosktool/userManagement.cpp @@ -82,7 +82,7 @@ void UserManagementPage::slotShowNotice() "If you want to use these profiles in combination with older versions you need " "to manually set the $TDEDIRS environment variable from the starttde " "script by adding the following line:

" - "export TDEDIRS=$(kiosktool-tdedirs)

").arg(AVAILABLE_SINCE), + "export TDEDIRS=$(kiosktool-tdedirs)

").tqarg(AVAILABLE_SINCE), i18n("Attention"), "user-profiles"); } @@ -171,12 +171,12 @@ void UserManagementPage::slotAddGroup() KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); UserManagementGroupUI *wid = new UserManagementGroupUI(&dlg); - wid->labelCaption->setFixedSize(wid->labelCaption->sizeHint()); + wid->labelCaption->setFixedSize(wid->labelCaption->tqsizeHint()); wid->comboGroup->insertStringList(m_allGroups); wid->comboProfile->insertStringList(m_allProfiles); - wid->setFixedSize(wid->sizeHint()); + wid->setFixedSize(wid->tqsizeHint()); dlg.setMainWidget(wid); - dlg.setFixedSize(dlg.sizeHint()); + dlg.setFixedSize(dlg.tqsizeHint()); while (dlg.exec() == KDialogBase::Accepted) { TQString group = wid->comboGroup->currentText(); @@ -193,7 +193,7 @@ void UserManagementPage::slotAddGroup() { int result = KMessageBox::warningContinueCancel(this, i18n("You already have a profile defined for group %1. " - "Do you want to replace it?").arg(group), + "Do you want to replace it?").tqarg(group), i18n("Duplicate Warning"), i18n("&Replace")); if (result != KMessageBox::Continue) @@ -242,12 +242,12 @@ void UserManagementPage::slotAddUser() KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); UserManagementUserUI *wid = new UserManagementUserUI(&dlg); - wid->labelCaption->setFixedSize(wid->labelCaption->sizeHint()); + wid->labelCaption->setFixedSize(wid->labelCaption->tqsizeHint()); wid->comboUser->insertStringList(m_allUsers); wid->comboProfile->insertStringList(m_allProfiles); - wid->setFixedSize(wid->sizeHint()); + wid->setFixedSize(wid->tqsizeHint()); dlg.setMainWidget(wid); - dlg.setFixedSize(dlg.sizeHint()); + dlg.setFixedSize(dlg.tqsizeHint()); while (dlg.exec() == KDialogBase::Accepted) { TQString user = wid->comboUser->currentText(); @@ -264,7 +264,7 @@ void UserManagementPage::slotAddUser() { int result = KMessageBox::warningContinueCancel(this, i18n("You already have a profile defined for user %1. " - "Do you want to replace it?").arg(user), + "Do you want to replace it?").tqarg(user), i18n("Duplicate Warning"), i18n("&Replace")); if (result != KMessageBox::Continue) diff --git a/kiosktool/userManagementGroup_ui.ui b/kiosktool/userManagementGroup_ui.ui index 92879a9..261ce5d 100644 --- a/kiosktool/userManagementGroup_ui.ui +++ b/kiosktool/userManagementGroup_ui.ui @@ -34,7 +34,7 @@ Expanding - + 20 10 @@ -43,7 +43,7 @@ - layout2 + tqlayout2 @@ -72,7 +72,7 @@ Fixed - + 20 20 @@ -102,7 +102,7 @@ Expanding - + 51 20 diff --git a/kiosktool/userManagementUser_ui.ui b/kiosktool/userManagementUser_ui.ui index d7bd5e5..f27088a 100644 --- a/kiosktool/userManagementUser_ui.ui +++ b/kiosktool/userManagementUser_ui.ui @@ -34,7 +34,7 @@ Expanding - + 20 10 @@ -43,7 +43,7 @@ - layout2 + tqlayout2 @@ -72,7 +72,7 @@ Fixed - + 20 20 @@ -102,7 +102,7 @@ Expanding - + 51 20 diff --git a/kiosktool/userManagement_ui.ui b/kiosktool/userManagement_ui.ui index 89c3b5f..4167e78 100644 --- a/kiosktool/userManagement_ui.ui +++ b/kiosktool/userManagement_ui.ui @@ -31,7 +31,7 @@ textLabel1 - + 0 0 @@ -91,7 +91,7 @@ listGroups - + 350 0 @@ -106,7 +106,7 @@ - layout1 + tqlayout1 @@ -130,7 +130,7 @@ Fixed - + 20 20 @@ -155,7 +155,7 @@ Expanding - + 20 31 @@ -212,7 +212,7 @@ - layout1_2 + tqlayout1_2 @@ -236,7 +236,7 @@ Fixed - + 20 20 @@ -261,7 +261,7 @@ Expanding - + 20 31