summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kiosktool/componentSelectionPage.cpp2
-rw-r--r--kiosktool/filetypeeditComponent.cpp4
-rw-r--r--kiosktool/kioskConfigDialog.cpp4
-rw-r--r--kiosktool/kioskgui.cpp12
-rw-r--r--kiosktool/kioskrun.cpp62
-rw-r--r--kiosktool/main.cpp2
-rw-r--r--kiosktool/menueditComponent.cpp2
-rw-r--r--kiosktool/profilePropsPage.cpp4
-rw-r--r--kiosktool/userManagement.cpp4
9 files changed, 48 insertions, 48 deletions
diff --git a/kiosktool/componentSelectionPage.cpp b/kiosktool/componentSelectionPage.cpp
index dfc58ed..9da1e86 100644
--- a/kiosktool/componentSelectionPage.cpp
+++ b/kiosktool/componentSelectionPage.cpp
@@ -64,7 +64,7 @@ void ComponentSelectionPage::load()
bool ComponentSelectionPage::save()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
config->writeEntry("CurrentComponent", currentComponent());
config->sync();
diff --git a/kiosktool/filetypeeditComponent.cpp b/kiosktool/filetypeeditComponent.cpp
index cbc615a..6a0a0b6 100644
--- a/kiosktool/filetypeeditComponent.cpp
+++ b/kiosktool/filetypeeditComponent.cpp
@@ -64,7 +64,7 @@ FileTypeEditComponent::setupFinished()
TQString mimetypeFiles = KioskRun::self()->locateLocal("mime", TQString());
TQString mimetypeSaveFiles = KioskRun::self()->locateSave("mime", TQString());
- KioskSync mimeDir(kapp->mainWidget());
+ KioskSync mimeDir(tdeApp->mainWidget());
mimeDir.addDir(mimetypeFiles, KURL());
TQStringList newMimetypeFiles = mimeDir.listFiles();
@@ -86,7 +86,7 @@ FileTypeEditComponent::setupFinished()
TQString legacyApplications = KioskRun::self()->locateLocal("apps", TQString());
TQString legacySaveApplications = KioskRun::self()->locateSave("apps", TQString());
- KioskSync legacyDir(kapp->mainWidget());
+ KioskSync legacyDir(tdeApp->mainWidget());
legacyDir.addDir(legacyApplications, KURL());
TQStringList newLegacyApplications = legacyDir.listFiles();
diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp
index 30eb3ed..1ef7d27 100644
--- a/kiosktool/kioskConfigDialog.cpp
+++ b/kiosktool/kioskConfigDialog.cpp
@@ -69,7 +69,7 @@ void KioskConfigDialog::init()
w->lineProfilePrefix->setURL(prefix);
}
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQString uploadURL = config->readEntry("uploadURL");
@@ -136,7 +136,7 @@ bool KioskConfigDialog::save()
if (w->checkUID->isChecked())
minUID = w->numUID->value();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
config->writeEntry("uploadURL", uploadURL);
config->writeEntry("uploadPrefix", uploadPrefix);
diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp
index f59e471..4744da2 100644
--- a/kiosktool/kioskgui.cpp
+++ b/kiosktool/kioskgui.cpp
@@ -91,7 +91,7 @@ KioskGui::KioskGui()
connect(m_view->pbDiscard, TQ_SIGNAL(clicked()), this, TQ_SLOT(discardPage()));
connect(m_view->pbFinished, TQ_SIGNAL(clicked()), this, TQ_SLOT(finishedPage()));
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
m_profile = config->readEntry("CurrentProfile", "default");
m_component = config->readEntry("CurrentComponent");
@@ -175,7 +175,7 @@ void KioskGui::setupActions()
void KioskGui::updateActions()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
bool uploadEnabled = !config->readEntry("uploadURL").isEmpty();
@@ -521,7 +521,7 @@ bool KioskGui::savePage(int page)
m_profile = m_profileSelectionPage->listProfile->selectedItem() ?
m_profileSelectionPage->listProfile->selectedItem()->text(0) : TQString();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
config->writeEntry("CurrentProfile", m_profile);
config->sync();
@@ -630,7 +630,7 @@ bool KioskGui::queryClose()
}
if (m_uploadAction->isEnabled())
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
KURL uploadUrl = config->readEntry("uploadURL");
@@ -647,7 +647,7 @@ bool KioskGui::queryClose()
void KioskGui::uploadAllProfiles()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQString uploadPrefix = config->readEntry("uploadPrefix");
TQString uploadURL = config->readEntry("uploadURL");
@@ -691,7 +691,7 @@ void KioskGui::uploadCurrentProfile()
void KioskGui::slotUpdateBackground()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
config->writeEntry("FancyBackground", m_backgroundAction->isChecked());
config->sync();
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index 5fc3137..e9dc8f3 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -736,7 +736,7 @@ KioskRun::setupRuntimeEnv()
{
if (m_dcopClient) return true;
- KioskRunProgressDialog dlg(kapp->mainWidget(), "kioskrun_progress",
+ KioskRunProgressDialog dlg(tdeApp->mainWidget(), "kioskrun_progress",
i18n("Setting Up Configuration Environment"),
i18n("Setting up configuration environment."));
@@ -903,10 +903,10 @@ KioskRun::createDir(const TQString &dir)
do
{
- if (NETACCESS::exists(dest, false, kapp->mainWidget()))
+ if (NETACCESS::exists(dest, false, tdeApp->mainWidget()))
return true;
- bool result = NETACCESS::mkdir(dest, kapp->mainWidget(), 0755);
+ bool result = NETACCESS::mkdir(dest, tdeApp->mainWidget(), 0755);
if (result == true)
return true;
@@ -924,7 +924,7 @@ KioskRun::createDir(const TQString &dir)
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, TQString(),
+ int msgResult = KMessageBox::warningYesNo(tdeApp->mainWidget(), msg, TQString(),
i18n("&Retry"), i18n("&Abort"));
if (msgResult == KMessageBox::No)
@@ -942,12 +942,12 @@ KioskRun::createDir(const TQString &dir)
bool
KioskRun::createRemoteDirRecursive(const KURL &dest, bool ask)
{
- if (NETACCESS::exists(dest, false, kapp->mainWidget()))
+ if (NETACCESS::exists(dest, false, tdeApp->mainWidget()))
return true;
KURL parent = dest.upURL();
- if (NETACCESS::exists(dest, false, kapp->mainWidget()))
+ if (NETACCESS::exists(dest, false, tdeApp->mainWidget()))
{
return createRemoteDir(dest);
}
@@ -955,7 +955,7 @@ KioskRun::createRemoteDirRecursive(const KURL &dest, bool ask)
if (ask)
{
// Parent doesn't exist,
- int result = KMessageBox::warningContinueCancel(kapp->mainWidget(),
+ int result = KMessageBox::warningContinueCancel(tdeApp->mainWidget(),
i18n("<qt>The directory <b>%1</b> does not yet exist. "
"Do you want to create it?").arg(parent.prettyURL()), TQString(),
i18n("Create &Dir"));
@@ -980,10 +980,10 @@ KioskRun::createRemoteDir(const KURL &dest)
{
do
{
- if (NETACCESS::exists(dest, false, kapp->mainWidget()))
+ if (NETACCESS::exists(dest, false, tdeApp->mainWidget()))
return true;
- if (NETACCESS::mkdir(dest, kapp->mainWidget(), 0755))
+ if (NETACCESS::mkdir(dest, tdeApp->mainWidget(), 0755))
return true;
#if KDE_IS_VERSION(3,2,91)
@@ -1006,7 +1006,7 @@ KioskRun::createRemoteDir(const KURL &dest)
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, TQString(),
+ int msgResult = KMessageBox::warningYesNo(tdeApp->mainWidget(), msg, TQString(),
i18n("&Retry"), i18n("&Abort"));
if (msgResult == KMessageBox::No)
@@ -1036,7 +1036,7 @@ KioskRun::install(const TQString &file, const TQString &destination)
{
KURL src;
src.setPath(file);
- bool result = NETACCESS::file_copy(src, dest, 0644, true, false, kapp->mainWidget());
+ bool result = NETACCESS::file_copy(src, dest, 0644, true, false, tdeApp->mainWidget());
if (result == true)
{
::unlink(TQFile::encodeName(file));
@@ -1055,7 +1055,7 @@ KioskRun::install(const TQString &file, const TQString &destination)
msg += i18n("Do you want to retry the installation or abort the saving of changes?</qt>");
- int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(),
+ int msgResult = KMessageBox::warningYesNo(tdeApp->mainWidget(), msg, TQString(),
i18n("&Retry"), i18n("&Abort"));
if (msgResult == KMessageBox::No)
@@ -1073,7 +1073,7 @@ KioskRun::uploadRemote(const TQString &file, const KURL &dest)
{
KURL src;
src.setPath(file);
- bool result = NETACCESS::file_copy(src, dest, 0644, true, false, kapp->mainWidget());
+ bool result = NETACCESS::file_copy(src, dest, 0644, true, false, tdeApp->mainWidget());
if (result == true)
return true;
@@ -1089,7 +1089,7 @@ KioskRun::uploadRemote(const TQString &file, const KURL &dest)
msg += i18n("Do you want to retry or abort the uploading?</qt>");
- int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(),
+ int msgResult = KMessageBox::warningYesNo(tdeApp->mainWidget(), msg, TQString(),
i18n("&Retry"), i18n("&Abort"));
if (msgResult == KMessageBox::No)
@@ -1112,7 +1112,7 @@ KioskRun::remove(const TQString &destination)
}
dest.setPath(destination);
- return NETACCESS::del(dest, kapp->mainWidget());
+ return NETACCESS::del(dest, tdeApp->mainWidget());
}
// Move file or directory
@@ -1141,7 +1141,7 @@ kdDebug() << "Moving " << src << " --> " << dest << endl;
if (!createRemoteDirRecursive(dest.upURL(), false))
return false;
- if (!NETACCESS::file_move(src, dest, -1, true, false, kapp->mainWidget()))
+ if (!NETACCESS::file_move(src, dest, -1, true, false, tdeApp->mainWidget()))
{
// TODO add error message + retry
return false;
@@ -1154,7 +1154,7 @@ kdDebug() << "Moving " << src << " --> " << dest << endl;
void
KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQString &installDir, TQString &installUser)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString defaultInstallDir = getProfilePrefix();
if (defaultInstallDir.isEmpty())
@@ -1202,7 +1202,7 @@ KioskRun::openKderc()
KURL settingsUrl;
settingsUrl.setPath(m_tderc);
- m_localKderc = ::locateLocal("tmp", "tderc_"+kapp->randomString(5));
+ m_localKderc = ::locateLocal("tmp", "tderc_"+tdeApp->randomString(5));
::unlink(TQFile::encodeName(m_localKderc));
KURL localCopyUrl;
@@ -1211,7 +1211,7 @@ KioskRun::openKderc()
if (TQFile::exists(settingsUrl.path()))
{
- while (!NETACCESS::copy(settingsUrl, localCopyUrl, kapp->mainWidget()))
+ while (!NETACCESS::copy(settingsUrl, localCopyUrl, tdeApp->mainWidget()))
{
TQString error = NETACCESS::lastErrorString();
TQString msg;
@@ -1225,7 +1225,7 @@ KioskRun::openKderc()
msg += i18n("Do you want to retry the operation or abort the saving of changes?</qt>");
- int msgResult = KMessageBox::warningYesNo(kapp->mainWidget(), msg, TQString(),
+ int msgResult = KMessageBox::warningYesNo(tdeApp->mainWidget(), msg, TQString(),
i18n("&Retry"), i18n("&Abort"));
if (msgResult == KMessageBox::No)
@@ -1251,7 +1251,7 @@ KioskRun::closeKderc()
bool result = install(m_localKderc, m_tderc);
m_localKderc = TQString();
m_user = saveUser;
- kapp->config()->reparseConfiguration();
+ tdeApp->config()->reparseConfiguration();
return result;
}
@@ -1270,7 +1270,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c
if (deleteProfile && !installDir.isEmpty())
{
bool result = true;
- KioskSync profileDir(kapp->mainWidget());
+ KioskSync profileDir(tdeApp->mainWidget());
profileDir.addDir(installDir, KURL());
TQStringList allFiles = profileDir.listFiles();
allFiles.remove(".kdeprofile");
@@ -1285,7 +1285,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c
}
else if (deleteFiles)
{
- int msgResult = KMessageBox::warningYesNoCancelList(kapp->mainWidget(),
+ int msgResult = KMessageBox::warningYesNoCancelList(tdeApp->mainWidget(),
i18n("<qt>The profile directory <b>%1</b> contains the following files, "
"do you wish to delete these files?").arg(installDir),
allFiles,
@@ -1328,7 +1328,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c
else if ((description != oldDescription) ||
(installUser != oldInstallUser))
{
- TQString localProfileInfo = ::locateLocal("tmp", "kdeprofile_"+kapp->randomString(5));
+ TQString localProfileInfo = ::locateLocal("tmp", "kdeprofile_"+tdeApp->randomString(5));
::unlink(TQFile::encodeName(localProfileInfo));
KSimpleConfig newProfileInfo(localProfileInfo);
newProfileInfo.writeEntry("Description", description);
@@ -1342,7 +1342,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c
KUser thisUser;
TQString newAdmin = thisUser.loginName()+":"; // This user, all hosts
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Directories");
TQString oldAdmin = config->readEntry("kioskAdmin");
@@ -1391,7 +1391,7 @@ KioskRun::deleteProfile(const TQString &profile, bool deleteFiles)
TQString
KioskRun::getProfilePrefix()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Directories");
@@ -1430,7 +1430,7 @@ KioskRun::newProfile()
{
TQString profilePrefix = getProfilePrefix();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
for(int p = 1; p; p++)
{
TQString profile = TQString("profile%1").arg(p);
@@ -1453,7 +1453,7 @@ KioskRun::newProfile()
TQStringList
KioskRun::allProfiles()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQStringList groups = config->groupList();
TQStringList profiles;
TQStringList directories;
@@ -1514,7 +1514,7 @@ KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users,
groups.clear();
users.clear();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Directories");
TQString mapFile = config->readEntry("userProfileMapFile");
@@ -1550,7 +1550,7 @@ KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users,
bool
KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMapping &users, const TQStringList &groupOrder)
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("Directories");
TQString mapFile = config->readEntry("userProfileMapFile");
if (mapFile.isEmpty())
@@ -1567,7 +1567,7 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap
return false;
}
- TQString localMapFile = ::locateLocal("tmp", "kde-user-profile_"+kapp->randomString(5));
+ TQString localMapFile = ::locateLocal("tmp", "kde-user-profile_"+tdeApp->randomString(5));
::unlink(TQFile::encodeName(localMapFile));
KSimpleConfig mapConfig(localMapFile);
diff --git a/kiosktool/main.cpp b/kiosktool/main.cpp
index 94918e5..4c39a3b 100644
--- a/kiosktool/main.cpp
+++ b/kiosktool/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
"the <i>Setup</i> functionality of the various components."));
}
- kapp->exec();
+ tdeApp->exec();
return 0;
}
diff --git a/kiosktool/menueditComponent.cpp b/kiosktool/menueditComponent.cpp
index 21dd22b..ab5fffe 100644
--- a/kiosktool/menueditComponent.cpp
+++ b/kiosktool/menueditComponent.cpp
@@ -165,7 +165,7 @@ MenuEditComponent::setupFinished()
TQString legacyApplications = KioskRun::self()->locateLocal("apps", TQString());
TQString legacySaveApplications = KioskRun::self()->locateSave("apps", TQString());
- KioskSync legacyDir(kapp->mainWidget());
+ KioskSync legacyDir(tdeApp->mainWidget());
legacyDir.addDir(legacyApplications, KURL());
TQStringList newLegacyApplications = legacyDir.listFiles();
diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index 7767660..14dd35b 100644
--- a/kiosktool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
@@ -40,7 +40,7 @@ static TQStringList userList()
result << thisUser.loginName();
result << "root";
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
result += config->readListEntry("PreviousUsers");
result.sort();
@@ -208,7 +208,7 @@ bool ProfilePropsPage::save()
}
// Store this user for easy access later
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQStringList previousUsers= config->readListEntry("PreviousUsers");
if (!previousUsers.contains(user))
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index 0285d09..c6d4992 100644
--- a/kiosktool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -152,7 +152,7 @@ bool UserManagementPage::save()
void UserManagementPage::slotAddGroup()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQStringList groupBlacklist = config->readListEntry("GroupBlacklist");
@@ -224,7 +224,7 @@ void UserManagementPage::slotDeleteGroup()
void UserManagementPage::slotAddUser()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
int minUID = config->readNumEntry("FirstUIDShown", 500);
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-13 22:39:03 +0000