summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/kile/kile.cpp6
-rw-r--r--src/kile/kiledocmanager.cpp12
-rw-r--r--src/kile/kiledocumentinfo.cpp6
-rw-r--r--src/kile/kilegrepdialog.cpp2
-rw-r--r--src/kile/kileprojectdlgs.cpp2
-rw-r--r--src/kile/managetemplatesdialog.cpp6
-rw-r--r--src/kile/newfilewizard.cpp2
-rw-r--r--src/kile/templates.cpp8
8 files changed, 22 insertions, 22 deletions
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp
index 211c40b..a463046 100644
--- a/src/kile/kile.cpp
+++ b/src/kile/kile.cpp
@@ -811,8 +811,8 @@ void Kile::restoreFilesAndProjects(bool allowRestore)
void Kile::setActive()
{
KILE_DEBUG() << "ACTIVATING" << endl;
- kapp->mainWidget()->raise();
- kapp->mainWidget()->setActiveWindow();
+ tdeApp->mainWidget()->raise();
+ tdeApp->mainWidget()->setActiveWindow();
}
void Kile::showTip()
@@ -2259,7 +2259,7 @@ void Kile::citeViewBib()
{
KILE_DEBUG() << "===void Kile::citeViewBib()===" << endl;
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
TQByteArray params, replyData;
TQCString replyType;
diff --git a/src/kile/kiledocmanager.cpp b/src/kile/kiledocmanager.cpp
index 909abde..f211824 100644
--- a/src/kile/kiledocmanager.cpp
+++ b/src/kile/kiledocmanager.cpp
@@ -800,7 +800,7 @@ void Manager::fileSaveAll(bool amAutoSaving, bool disUntitled )
// get the right permissions, start with safe default
mode_t perms = 0600;
TDEIO::UDSEntry fentry;
- if (TDEIO::NetAccess::stat (url, fentry, kapp->mainWidget()))
+ if (TDEIO::NetAccess::stat (url, fentry, tdeApp->mainWidget()))
{
KILE_DEBUG () << "stating successful: " << url.prettyURL() << endl;
KFileItem item (fentry, url);
@@ -809,9 +809,9 @@ void Manager::fileSaveAll(bool amAutoSaving, bool disUntitled )
// first del existing file if any, than copy over the file we have
// failure if a: the existing file could not be deleted, b: the file could not be copied
- if ( (!TDEIO::NetAccess::exists( backupUrl, false, kapp->mainWidget() )
- || TDEIO::NetAccess::del( backupUrl, kapp->mainWidget() ) )
- && TDEIO::NetAccess::file_copy( url, backupUrl, perms, true, false, kapp->mainWidget() ) )
+ if ( (!TDEIO::NetAccess::exists( backupUrl, false, tdeApp->mainWidget() )
+ || TDEIO::NetAccess::del( backupUrl, tdeApp->mainWidget() ) )
+ && TDEIO::NetAccess::file_copy( url, backupUrl, perms, true, false, tdeApp->mainWidget() ) )
{
KILE_DEBUG()<<"backing up successful ("<<url.prettyURL()<<" -> "<<backupUrl.prettyURL()<<")"<<endl;
}
@@ -932,7 +932,7 @@ void Manager::fileSaveAs(Kate::View* view)
if(info->getType() == KileDocument::LaTeX) {
saveURL = Info::makeValidTeXURL(saveURL, m_ki->extensions()->isTexFile(saveURL), false); // don't check for file existence
}
- if(TDEIO::NetAccess::exists(saveURL, true, kapp->mainWidget())) // check for writing possibility
+ if(TDEIO::NetAccess::exists(saveURL, true, tdeApp->mainWidget())) // check for writing possibility
{
int r = KMessageBox::warningContinueCancel(m_ki->parentWidget(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it ?").arg(saveURL.fileName()), i18n("Overwrite File ?"), KGuiItem(i18n("&Overwrite")), TQString());
if(r != KMessageBox::Continue)
@@ -1384,7 +1384,7 @@ KileProject* Manager::projectOpen(const KURL & url, int step, int max, bool open
{
projectOpenItem(*i, openProjectItemViews);
m_kpd->progressBar()->setValue(counter + project_steps);
- kapp->processEvents();
+ tdeApp->processEvents();
++counter;
}
diff --git a/src/kile/kiledocumentinfo.cpp b/src/kile/kiledocumentinfo.cpp
index 1eb3ab5..cefb5fc 100644
--- a/src/kile/kiledocumentinfo.cpp
+++ b/src/kile/kiledocumentinfo.cpp
@@ -112,7 +112,7 @@ KURL Info::repairInvalidCharacters(const KURL& url, bool checkForFileExistence /
KURL Info::renameIfExist(const KURL& url)
{
KURL ret(url);
- while ( TDEIO::NetAccess::exists(url, true, kapp->mainWidget()) ) // check for writing possibility
+ while ( TDEIO::NetAccess::exists(url, true, tdeApp->mainWidget()) ) // check for writing possibility
{
bool isOK;
TQString newURL = KInputDialog::getText(
@@ -163,7 +163,7 @@ KURL Info::makeValidTeXURL(const KURL & url, bool istexfile, bool checkForFileEx
return newURL;
}
-Info::Info() : m_bIsRoot(false), m_config(kapp->config()), documentTypePromotionAllowed(true)
+Info::Info() : m_bIsRoot(false), m_config(tdeApp->config()), documentTypePromotionAllowed(true)
{
updateStructLevelInfo();
}
@@ -885,7 +885,7 @@ void LaTeXInfo::updateStruct()
if (teller > 100)
{
teller=0;
- kapp->processEvents();
+ tdeApp->processEvents();
}
else
++teller;
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index b40ebc4..e78e9e6 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -527,7 +527,7 @@ void KileGrepDialog::processOutput()
}
buf = buf.right(buf.length()-pos-1);
}
- kapp->processEvents();
+ tdeApp->processEvents();
}
void KileGrepDialog::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp
index 5819b4b..b4f37d4 100644
--- a/src/kile/kileprojectdlgs.cpp
+++ b/src/kile/kileprojectdlgs.cpp
@@ -527,7 +527,7 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument:
m_cbQuick = new KComboBox(group3);
lb2->setBuddy(m_cbQuick);
m_cbQuick->insertItem(tool_default);
- m_cbQuick->insertStringList(KileTool::configNames("QuickBuild", kapp->config()));
+ m_cbQuick->insertStringList(KileTool::configNames("QuickBuild", tdeApp->config()));
m_cbQuick->setCurrentText(project->quickBuildConfig().length() > 0 ? project->quickBuildConfig() : tool_default );
//don't put this after the call to toggleMakeIndex
diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp
index 742e81f..16ba4b2 100644
--- a/src/kile/managetemplatesdialog.cpp
+++ b/src/kile/managetemplatesdialog.cpp
@@ -209,12 +209,12 @@ void ManageTemplatesDialog::addTemplate() {
return;
}
- if (!TDEIO::NetAccess::exists(iconURL, true, kapp->mainWidget())) {
+ if (!TDEIO::NetAccess::exists(iconURL, true, tdeApp->mainWidget())) {
KMessageBox::error(this, i18n("Sorry, but the icon file: %1\ndoes not seem to exist. Please choose a new icon.").arg(icon));
return;
}
- if (!TDEIO::NetAccess::exists(m_sourceURL, true, kapp->mainWidget())) {
+ if (!TDEIO::NetAccess::exists(m_sourceURL, true, tdeApp->mainWidget())) {
KMessageBox::error(this, i18n("Sorry, but the file: %1\ndoes not seem to exist. Maybe you forgot to save the file?").arg(m_sourceURL.prettyURL()));
return;
}
@@ -261,7 +261,7 @@ bool ManageTemplatesDialog::removeTemplate()
KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
- if (!(TDEIO::NetAccess::exists(KURL::fromPathOrURL(templateInfo.path), false, kapp->mainWidget()) && (TDEIO::NetAccess::exists(KURL::fromPathOrURL(templateInfo.icon), false, kapp->mainWidget()) || !TQFileInfo(templateInfo.icon).exists()))) {
+ if (!(TDEIO::NetAccess::exists(KURL::fromPathOrURL(templateInfo.path), false, tdeApp->mainWidget()) && (TDEIO::NetAccess::exists(KURL::fromPathOrURL(templateInfo.icon), false, tdeApp->mainWidget()) || !TQFileInfo(templateInfo.icon).exists()))) {
KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template."));
return false;
}
diff --git a/src/kile/newfilewizard.cpp b/src/kile/newfilewizard.cpp
index 9428c1f..d19722b 100644
--- a/src/kile/newfilewizard.cpp
+++ b/src/kile/newfilewizard.cpp
@@ -40,7 +40,7 @@ NewFileWizard::NewFileWizard(KileTemplate::Manager *templateManager, TQWidget *p
: KDialogBase(parent,name,true,i18n("New File"),KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), m_templateManager(templateManager), m_currentlyDisplayedType(-1)
{
// first read config
- m_config = kapp->config();
+ m_config = tdeApp->config();
m_config->setGroup("NewFileWizard");
bool wizard = m_config->readBoolEntry("UseWizardWhenCreatingEmptyFile", false);
int w = m_config->readNumEntry("width", -1);
diff --git a/src/kile/templates.cpp b/src/kile/templates.cpp
index b44372b..c1d9587 100644
--- a/src/kile/templates.cpp
+++ b/src/kile/templates.cpp
@@ -73,7 +73,7 @@ bool Manager::copyAppData(const KURL& src, const TQString& subdir, const TQStrin
//if a directory is found
if (!dir.isNull()) {
- return TDEIO::NetAccess::copy(src, targetURL, kapp->mainWidget());
+ return TDEIO::NetAccess::copy(src, targetURL, tdeApp->mainWidget());
}
else {
KMessageBox::error(0, i18n("Could not find a folder to save %1 to.\nCheck whether you have a .kde folder with write permissions in your home folder.").arg(fileName));
@@ -84,7 +84,7 @@ bool Manager::copyAppData(const KURL& src, const TQString& subdir, const TQStrin
bool Manager::removeAppData(const TQString &file) {
TQFileInfo fileInfo(file);
if(fileInfo.exists()) {
- return TDEIO::NetAccess::del(KURL::fromPathOrURL(file), kapp->mainWidget());
+ return TDEIO::NetAccess::del(KURL::fromPathOrURL(file), tdeApp->mainWidget());
}
return true;
}
@@ -123,10 +123,10 @@ bool Manager::replace(const KileTemplate::Info& toBeReplaced, const KURL& newTem
//start by copying the files that belong to the new template to a safe place
TQString templateTempFile, iconTempFile;
- if(!TDEIO::NetAccess::download(newTemplateSourceURL, templateTempFile, kapp->mainWidget())) {
+ if(!TDEIO::NetAccess::download(newTemplateSourceURL, templateTempFile, tdeApp->mainWidget())) {
return false;
}
- if(!TDEIO::NetAccess::download(newIcon, iconTempFile, kapp->mainWidget())) {
+ if(!TDEIO::NetAccess::download(newIcon, iconTempFile, tdeApp->mainWidget())) {
TDEIO::NetAccess::removeTempFile(templateTempFile);
return false;
}