summaryrefslogtreecommitdiffstats
path: root/kiosktool
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:36:50 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-07-30 19:33:10 +0200
commit68b859629107d1395d503acd48b460242e6dc677 (patch)
tree51932a9de06829d4bf72d3b882a2a6049da98c91 /kiosktool
parent2eac26314d787935769ed0f4a632703ca1bcddad (diff)
downloadkiosktool-68b859629107d1395d503acd48b460242e6dc677.tar.gz
kiosktool-68b859629107d1395d503acd48b460242e6dc677.zip
Remove additional unneeded tq method conversions
(cherry picked from commit a4741f6c87d0ed48e18c7cfb05df66e94b9f97a7)
Diffstat (limited to 'kiosktool')
-rw-r--r--kiosktool/componentPage.cpp10
-rw-r--r--kiosktool/componentPage_ui.ui2
-rw-r--r--kiosktool/kcms/autostart/kcmautostart.cpp2
-rw-r--r--kiosktool/kioskConfigDialog.cpp2
-rw-r--r--kiosktool/kioskdata.cpp4
-rw-r--r--kiosktool/kioskgui.cpp10
-rw-r--r--kiosktool/kioskrun.cpp50
-rw-r--r--kiosktool/kiosksync.cpp4
-rw-r--r--kiosktool/kiosktool-kdedirs.cpp2
-rw-r--r--kiosktool/mainview.ui2
-rw-r--r--kiosktool/profilePropsPage.cpp4
-rw-r--r--kiosktool/userManagement.cpp6
12 files changed, 49 insertions, 49 deletions
diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp
index 3f7e3a7..40d4976 100644
--- a/kiosktool/componentPage.cpp
+++ b/kiosktool/componentPage.cpp
@@ -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").tqarg(m_data->caption));
- pbPreview->setText(i18n("&Preview %1").tqarg(m_data->caption));
+ pbSetup->setText(i18n("&Setup %1").arg(m_data->caption));
+ pbPreview->setText(i18n("&Preview %1").arg(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").tqarg(m_data->caption);
+ return i18n("Setup %1").arg(m_data->caption);
}
void ComponentPage::slotSetup()
@@ -154,7 +154,7 @@ void ComponentPage::slotSetup()
int result = KMessageBox::questionYesNo(this,
i18n("<qt>You can now configure %1. "
"When you are finished click <b>Save</b> to make the new configuration permanent.")
- .tqarg(m_data->caption), i18n("%1 Setup").tqarg(m_data->caption),
+ .arg(m_data->caption), i18n("%1 Setup").arg(m_data->caption),
KStdGuiItem::save(), KStdGuiItem::discard());
m_saveSettings = (result == KMessageBox::Yes);
if (!dcopApp.isEmpty())
@@ -254,7 +254,7 @@ void ComponentPage::slotPreview()
i18n("<qt>This is how %1 will behave and look with the new settings. "
"Any changes you now make to the settings will not be saved.<p>"
"Click <b>Ok</b> to return to your own personal %2 configuration.")
- .tqarg(m_data->caption, m_data->caption), i18n("%1 Preview").tqarg(m_data->caption));
+ .arg(m_data->caption, m_data->caption), i18n("%1 Preview").arg(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 1f73734..84a7fd3 100644
--- a/kiosktool/componentPage_ui.ui
+++ b/kiosktool/componentPage_ui.ui
@@ -41,7 +41,7 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp
index ea46796..671d56f 100644
--- a/kiosktool/kcms/autostart/kcmautostart.cpp
+++ b/kiosktool/kcms/autostart/kcmautostart.cpp
@@ -88,7 +88,7 @@ void setModuleGroup(KConfig *config, const TQString &filename)
if (i != -1)
module = module.left(i);
- config->setGroup(TQString("Module-%1").tqarg(module));
+ config->setGroup(TQString("Module-%1").arg(module));
}
bool AutoStartConfig::autoloadEnabled(KConfig *config, const TQString &filename)
diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp
index 7111e5f..02fb931 100644
--- a/kiosktool/kioskConfigDialog.cpp
+++ b/kiosktool/kioskConfigDialog.cpp
@@ -113,7 +113,7 @@ void KioskConfigDialog::updateExample()
if (!url.endsWith("/"))
url += "/";
url += file2;
- TQString example = TQString("<qt><center><b>%1</b><br>--><br><b>%2</b></center>").tqarg(file1, url);
+ TQString example = TQString("<qt><center><b>%1</b><br>--><br><b>%2</b></center>").arg(file1, url);
w->lblUploadExample->setText(example);
w->lblUploadExample->setFixedSize(TQSize(500,fontMetrics().lineSpacing()*3 + 6));
}
diff --git a/kiosktool/kioskdata.cpp b/kiosktool/kioskdata.cpp
index ff45343..df6fdae 100644
--- a/kiosktool/kioskdata.cpp
+++ b/kiosktool/kioskdata.cpp
@@ -267,7 +267,7 @@ bool KioskData::load()
TQFile file( filename );
if ( !file.open( IO_ReadOnly ) )
{
- m_errorMsg = i18n("<qt>Could not open <b>%1</b></qt>").tqarg(filename);
+ m_errorMsg = i18n("<qt>Could not open <b>%1</b></qt>").arg(filename);
return false;
}
@@ -276,7 +276,7 @@ bool KioskData::load()
int errorCol;
if ( !doc.setContent( &file, &errorMsg, &errorRow, &errorCol ) )
{
- m_errorMsg = i18n("<qt>Syntax error in <b>%1</b><br>Line %3, column %4: %2</qt>").tqarg(filename, errorMsg).tqarg(errorRow).tqarg(errorCol);
+ m_errorMsg = i18n("<qt>Syntax error in <b>%1</b><br>Line %3, column %4: %2</qt>").arg(filename, errorMsg).arg(errorRow).arg(errorCol);
file.close();
return false;
}
diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp
index 2f1e75e..afdc190 100644
--- a/kiosktool/kioskgui.cpp
+++ b/kiosktool/kioskgui.cpp
@@ -126,7 +126,7 @@ void KioskGui::slotCheckEtcSkel()
"<b>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.</b><p>"
- "The following files were found under <b>%2</b>:").tqarg(etcSkel).tqarg(etcSkel),
+ "The following files were found under <b>%2</b>:").arg(etcSkel).arg(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("<qt>You are about to delete the profile <b>%1</b>.<p>"
- "Are you sure you want to do this?").tqarg(profile),
+ "Are you sure you want to do this?").arg(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\"").tqarg(m_profile));
+ setSubCaption(i18n("Setup Profile \"%1\"").arg(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("<qt>Do you want to upload the profiles to <b>%1</b> ?</qt>").tqarg(uploadUrl.prettyURL()));
+ i18n("<qt>Do you want to upload the profiles to <b>%1</b> ?</qt>").arg(uploadUrl.prettyURL()));
if (result == KMessageBox::Yes)
{
uploadAllProfiles();
@@ -681,7 +681,7 @@ void KioskGui::uploadAllProfiles()
if (sync.sync())
{
- KMessageBox::information(this, i18n("<qt>All profiles have been successfully uploaded to <b>%1</b>").tqarg(uploadURL));
+ KMessageBox::information(this, i18n("<qt>All profiles have been successfully uploaded to <b>%1</b>").arg(uploadURL));
}
}
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index 6f0bed0..4656465 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").tqarg(kdeHome).tqarg("tmp").tqarg(hostname);
+ TQString tmpDir = TQString("%1/%2-%3").arg(kdeHome).arg("tmp").arg(hostname);
deleteDir(tmpDir);
::mkdir(TQFile::encodeName(newTmpDir), 0700);
::symlink(TQFile::encodeName(newTmpDir), TQFile::encodeName(tmpDir));
- TQString socketDir = TQString("%1/%2-%3").tqarg(kdeHome).tqarg("socket").tqarg(hostname);
+ TQString socketDir = TQString("%1/%2-%3").arg(kdeHome).arg("socket").arg(hostname);
deleteDir(socketDir);
::mkdir(TQFile::encodeName(newSocketDir), 0700);
::symlink(TQFile::encodeName(newSocketDir), TQFile::encodeName(socketDir));
- m_configDir = TQString("%1/.kde/share/config/").tqarg(m_homeDir);
+ m_configDir = TQString("%1/.kde/share/config/").arg(m_homeDir);
m_instance = new KInstance("kioskrun");
(void) m_instance->dirs(); // Create KStandardDirs obj
@@ -377,7 +377,7 @@ KioskRun::setConfigImmutable(const TQString &filename, const TQString &_group, b
}
else
{
- TQString group = TQString("[%1]").tqarg(_group);
+ TQString group = TQString("[%1]").arg(_group);
if (status->m_lines.find(group))
{
if (!bImmutable)
@@ -743,7 +743,7 @@ KioskRun::setupRuntimeEnv()
char hostname[256];
hostname[0] = 0;
gethostname(hostname, 255);
- TQString cacheDir = TQString("%1/.kde/cache-%2").tqarg(m_homeDir).tqarg(hostname);
+ TQString cacheDir = TQString("%1/.kde/cache-%2").arg(m_homeDir).arg(hostname);
deleteDir(cacheDir);
KStandardDirs::makeDir(cacheDir);
@@ -751,10 +751,10 @@ KioskRun::setupRuntimeEnv()
::unlink(TQFile::encodeName(m_homeDir+".kderc"));
- TQString iceAuth = TQString("%1/.ICEauthority").tqarg(TQDir::homeDirPath());
+ TQString iceAuth = TQString("%1/.ICEauthority").arg(TQDir::homeDirPath());
setenv("ICEAUTHORITY", TQFile::encodeName(iceAuth), 0); // Don't overwrite existing setting
- TQString xAuth = TQString("%1/.Xauthority").tqarg(TQDir::homeDirPath());
+ TQString xAuth = TQString("%1/.Xauthority").arg(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("<qt>The directory <b>%1</b> could not be created because of an unspecified problem.<p>")
- .tqarg(dir);
+ .arg(dir);
else
msg = i18n("<qt>The directory <b>%1</b> could not be created because of the following problem:"
"<p>%2<p>")
- .tqarg(dir, NETACCESS::lastErrorString());
+ .arg(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>");
@@ -944,7 +944,7 @@ 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?").tqarg(parent.prettyURL()), TQString(),
+ "Do you want to create it?").arg(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("<qt>The directory <b>%1</b> could not be created because of an unspecified problem.<p>")
- .tqarg(dest.prettyURL());
+ .arg(dest.prettyURL());
else
msg = i18n("<qt>The directory <b>%1</b> could not be created because of the following problem:"
"<p>%2<p>")
- .tqarg(dest.prettyURL(), NETACCESS::lastErrorString());
+ .arg(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>");
@@ -1034,11 +1034,11 @@ KioskRun::install(const TQString &file, const TQString &destination)
TQString msg;
if (error.isEmpty())
msg = i18n("<qt>The file <b>%1</b> could not be installed because of an unspecified problem.")
- .tqarg(destination);
+ .arg(destination);
else
msg = i18n("<qt>The file <b>%1</b> could not be installed because of the following problem:"
"<p>%2<p>")
- .tqarg(destination, NETACCESS::lastErrorString());
+ .arg(destination, NETACCESS::lastErrorString());
msg += i18n("Do you want to retry the installation or abort the saving of changes?</qt>");
@@ -1068,11 +1068,11 @@ KioskRun::uploadRemote(const TQString &file, const KURL &dest)
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.")
- .tqarg(file, dest.prettyURL());
+ .arg(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>")
- .tqarg(file, dest.prettyURL(),NETACCESS::lastErrorString());
+ .arg(file, dest.prettyURL(),NETACCESS::lastErrorString());
msg += i18n("Do you want to retry or abort the uploading?</qt>");
@@ -1156,7 +1156,7 @@ KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQStrin
tmp.replace("/", "_");
defaultInstallDir += tmp+"/";
- TQString group = TQString("Directories-%1").tqarg(profile);
+ TQString group = TQString("Directories-%1").arg(profile);
config->setGroup(group);
installDir = config->readEntry("prefixes", defaultInstallDir);
@@ -1204,11 +1204,11 @@ KioskRun::openKderc()
TQString msg;
if (error.isEmpty())
msg = i18n("<qt>The file <b>%1</b> could not be accessed because of an unspecified problem.")
- .tqarg(settingsUrl.path());
+ .arg(settingsUrl.path());
else
msg = i18n("<qt>The file <b>%1</b> could not be accessed because of the following problem:"
"<p>%2<p>")
- .tqarg(settingsUrl.path(), error);
+ .arg(settingsUrl.path(), error);
msg += i18n("Do you want to retry the operation or abort the saving of changes?</qt>");
@@ -1274,7 +1274,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c
{
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?").tqarg(installDir),
+ "do you wish to delete these files?").arg(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").tqarg(profile);
+ TQString group = TQString("Directories-%1").arg(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").tqarg(p);
- TQString group = TQString("Directories-%1").tqarg(profile);
+ TQString profile = TQString("profile%1").arg(p);
+ TQString group = TQString("Directories-%1").arg(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").tqarg(i+1);
+ TQString key = TQString("rule_%1").arg(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").tqarg(i+1);
+ TQString key = TQString("rule_%1").arg(i+1);
cfg->writeEntry(key, urlRestrictions[i]);
}
KioskRun::self()->setConfigImmutable(file, group, true);
diff --git a/kiosktool/kiosksync.cpp b/kiosktool/kiosksync.cpp
index 4fc0b8c..3f20044 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 <b>%1</b> does not exist.").tqarg(_dir));
+ emit warning(i18n("Directory <b>%1</b> does not exist.").arg(_dir));
return;
}
if (!dir.isReadable())
{
- emit warning(i18n("Directory <b>%1</b> is not readable.").tqarg(_dir));
+ emit warning(i18n("Directory <b>%1</b> is not readable.").arg(_dir));
return;
}
diff --git a/kiosktool/kiosktool-kdedirs.cpp b/kiosktool/kiosktool-kdedirs.cpp
index 1dad173..f62ecd7 100644
--- a/kiosktool/kiosktool-kdedirs.cpp
+++ b/kiosktool/kiosktool-kdedirs.cpp
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
while(!profiles.isEmpty())
{
TQString profile = profiles.back();
- config->setGroup(TQString::fromLatin1("Directories-%1").tqarg(profile));
+ config->setGroup(TQString::fromLatin1("Directories-%1").arg(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 006e84f..dc1ee41 100644
--- a/kiosktool/mainview.ui
+++ b/kiosktool/mainview.ui
@@ -84,7 +84,7 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index 4396218..97ca85d 100644
--- a/kiosktool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
@@ -150,7 +150,7 @@ bool ProfilePropsPage::save()
if (!userInfo.isValid())
{
KMessageBox::sorry(this,
- i18n("<qt>The user <b>%1</b> is not an existing user.</qt>").tqarg(user));
+ i18n("<qt>The user <b>%1</b> is not an existing user.</qt>").arg(user));
comboUser->setFocus();
return false;
}
@@ -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>")
- .tqarg(m_origInstallDir, installDir, m_origInstallDir, installDir),
+ .arg(m_origInstallDir, installDir, m_origInstallDir, installDir),
fileList,
i18n("Profile Directory Changed"));
if (msgResult != KMessageBox::Continue)
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index 7f2856a..a215571 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 $KDEDIRS environment variable from the <b>startkde</b> "
"script by adding the following line:<br><br>"
- "<i>export KDEDIRS=$(kiosktool-kdedirs)</i><br><br>").tqarg(AVAILABLE_SINCE),
+ "<i>export KDEDIRS=$(kiosktool-kdedirs)</i><br><br>").arg(AVAILABLE_SINCE),
i18n("Attention"), "user-profiles");
}
@@ -193,7 +193,7 @@ void UserManagementPage::slotAddGroup()
{
int result = KMessageBox::warningContinueCancel(this,
i18n("<qt>You already have a profile defined for group <b>%1</b>. "
- "Do you want to replace it?</qt>").tqarg(group),
+ "Do you want to replace it?</qt>").arg(group),
i18n("Duplicate Warning"),
i18n("&Replace"));
if (result != KMessageBox::Continue)
@@ -264,7 +264,7 @@ void UserManagementPage::slotAddUser()
{
int result = KMessageBox::warningContinueCancel(this,
i18n("<qt>You already have a profile defined for user <b>%1</b>. "
- "Do you want to replace it?</<qt>").tqarg(user),
+ "Do you want to replace it?</<qt>").arg(user),
i18n("Duplicate Warning"),
i18n("&Replace"));
if (result != KMessageBox::Continue)