summaryrefslogtreecommitdiffstats
path: root/quanta/project
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/project')
-rw-r--r--quanta/project/project.cpp14
-rw-r--r--quanta/project/project.h4
-rw-r--r--quanta/project/projectnewlocal.cpp2
-rw-r--r--quanta/project/projectprivate.cpp24
-rw-r--r--quanta/project/projectprivate.h4
-rw-r--r--quanta/project/projectupload.cpp26
-rw-r--r--quanta/project/projectupload.h6
-rw-r--r--quanta/project/rescanprj.cpp30
-rw-r--r--quanta/project/rescanprj.h4
9 files changed, 57 insertions, 57 deletions
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index aed1942e..3e29c099 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -167,7 +167,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint )
}
-void Project::readConfig(KConfig *config)
+void Project::readConfig(TDEConfig *config)
{
d->config = config;
config->setGroup("General Options");
@@ -209,10 +209,10 @@ void Project::loadLastProject(bool reload)
TQString tempPath = tempList[0];
TQString sessionTempPath = sessionTempList[0];
// test if the remote project is available
- if ( KIO::NetAccess::exists(url, false, d->m_mainWindow) )
+ if ( TDEIO::NetAccess::exists(url, false, d->m_mainWindow) )
{
KURL tempURL = KURL().fromPathOrURL(tempPath);
- if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) &&
+ if (TDEIO::NetAccess::exists(tempURL, false, d->m_mainWindow) &&
KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") )
== KMessageBox::Yes)
{
@@ -448,7 +448,7 @@ void Project::slotRemove(const KURL& urlToRemove)
TQString passwd = password(e.attribute("remote_protocol") + "://" + e.attribute("user") + "@" + e.attribute("remote_host"));
baseUrl.setPass(passwd);
baseUrl.addPath(urlPath);
- KIO::NetAccess::del(baseUrl, d->m_mainWindow);
+ TDEIO::NetAccess::del(baseUrl, d->m_mainWindow);
}
}
}
@@ -997,7 +997,7 @@ KURL Project::projectBaseURL()
void Project::savePassword(const TQString &entry, const TQString &passwd, bool store)
{
d->m_passwdList[entry] = passwd;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Projects");
if (store)
{
@@ -1017,7 +1017,7 @@ TQString Project::password(const TQString &entry)
return d->m_passwdList[entry];
else
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Projects");
TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,""));
// TQString passwd = config->readEntry(d->projectName + " | " + entry,"");
@@ -1027,7 +1027,7 @@ TQString Project::password(const TQString &entry)
bool Project::passwordSaved(const TQString &entry)
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Projects");
TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,""));
// TQString passwd = config->readEntry(d->projectName + " | " + entry,"");
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 9014d16f..42d18fef 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -36,7 +36,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions;
*@author Yacovlev Alexander & Dmitry Poplavsky & Andras Mantia & Jens Herden
*/
-class KConfig;
+class TDEConfig;
class KMainWindow;
struct TeamMember {
@@ -80,7 +80,7 @@ public:
KURL::List files();
void insertFile( const KURL& nameURL, bool repaint );
- void readConfig(KConfig *);
+ void readConfig(TDEConfig *);
/** loads the last project again if reload == true
but checks in any case if there is a left over project from a crash
*/
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index fb67e4fb..97d824f4 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -352,7 +352,7 @@ void ProjectNewLocal::slotClearList()
//Really wondering why would we delete the files from baseURL???
//I've added this code, but I don't remember the reason. :-(
//Anyway, it is quite evil thing to do.
- //KIO::del( baseURL );
+ //TDEIO::del( baseURL );
listView->clear();
fileList.clear();
checkInsert->setChecked(false);
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index fd49f0ce..096ef83f 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -1010,7 +1010,7 @@ bool ProjectPrivate::createEmptyDom()
tempFile->close();
result = QExtFileInfo::createDir(baseURL, m_mainWindow);
if (result)
- result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow);
+ result = TDEIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow);
if (result)
m_tmpProjectFile = tempFile->name();
@@ -1019,7 +1019,7 @@ bool ProjectPrivate::createEmptyDom()
sessionTempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8);
*(sessionTempFile->textStream()) << sessionStr;
sessionTempFile->close();
- result = KIO::NetAccess::upload(sessionTempFile->name(), sessionURL, m_mainWindow);
+ result = TDEIO::NetAccess::upload(sessionTempFile->name(), sessionURL, m_mainWindow);
if (result)
m_tmpSessionFile= sessionTempFile->name();
} else
@@ -1364,8 +1364,8 @@ bool ProjectPrivate::loadProject(const KURL &url)
TQString sessionTmpFile;
// test if url is writeable and download to local file
- if (KIO::NetAccess::exists(url, false, m_mainWindow) &&
- KIO::NetAccess::download(url, projectTmpFile, m_mainWindow))
+ if (TDEIO::NetAccess::exists(url, false, m_mainWindow) &&
+ TDEIO::NetAccess::download(url, projectTmpFile, m_mainWindow))
{
if (parent->hasProject())
{
@@ -1378,8 +1378,8 @@ bool ProjectPrivate::loadProject(const KURL &url)
else
fileName += ".session";
sessionURL.setFileName(fileName);
- if (KIO::NetAccess::exists(sessionURL, false, m_mainWindow))
- KIO::NetAccess::download(sessionURL, sessionTmpFile, m_mainWindow);
+ if (TDEIO::NetAccess::exists(sessionURL, false, m_mainWindow))
+ TDEIO::NetAccess::download(sessionURL, sessionTmpFile, m_mainWindow);
else
{
TQString sessionStr;
@@ -1635,7 +1635,7 @@ bool ProjectPrivate::uploadProjectFile()
m_tmpProjectFile = TQString();
return true;
}
- if (KIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && KIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow))
+ if (TDEIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && TDEIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow))
{
removeFromConfig(projectURL.url()); // remove the project from the list of open projects
if (quantaApp)
@@ -1647,11 +1647,11 @@ bool ProjectPrivate::uploadProjectFile()
delete sessionTempFile;
sessionTempFile = 0L;
// second the one from downloading a project
- KIO::NetAccess::removeTempFile(m_tmpProjectFile);
- KIO::NetAccess::removeTempFile(m_tmpSessionFile);
+ TDEIO::NetAccess::removeTempFile(m_tmpProjectFile);
+ TDEIO::NetAccess::removeTempFile(m_tmpSessionFile);
// third if we recovered after crash
- KIO::NetAccess::del(KURL().fromPathOrURL(m_tmpProjectFile), m_mainWindow);
- KIO::NetAccess::del(KURL().fromPathOrURL(m_tmpSessionFile), m_mainWindow);
+ TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tmpProjectFile), m_mainWindow);
+ TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tmpSessionFile), m_mainWindow);
m_tmpProjectFile = "";
m_tmpSessionFile = "";
}
@@ -1660,7 +1660,7 @@ bool ProjectPrivate::uploadProjectFile()
if (quantaApp)
{
parent->statusMsg(TQString() );
- KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString());
+ KMessageBox::error(m_mainWindow, TDEIO::NetAccess::lastErrorString());
}
return false;
}
diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h
index aa01a91d..0b0a14df 100644
--- a/quanta/project/projectprivate.h
+++ b/quanta/project/projectprivate.h
@@ -32,7 +32,7 @@ class TQWidgetStack;
class KAction;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KDirWatch;
class KRecentFilesAction;
class KSelectAction;
@@ -83,7 +83,7 @@ upload.*/
TQWidgetStack *stack;
TQString currentProjectView;
- KConfig *config;
+ TDEConfig *config;
bool m_modified;
bool m_excludeCvsignore;
/** Default DTD for this project. */
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index f38cf937..1f389cb4 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -158,7 +158,7 @@ void ProjectUpload::slotBuildTree()
{
emit eventHappened("upload_requested", m_project->projectBaseURL().url(), "");
loadRemoteUploadInfo();
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
TQString strUrl = QuantaCommon::qUrl(startUrl);
bool isDirectory = strUrl.endsWith("/");
bool forceUpload = !startUrl.isEmpty();
@@ -209,7 +209,7 @@ void ProjectUpload::slotBuildTree()
int uploadedTime = -1;
if (m_uploadTimeList.contains(s))
uploadedTime = m_uploadTimeList[s];
- int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
+ int modifiedTime = item.time(TDEIO::UDS_MODIFICATION_TIME);
el.setAttribute("modified_time", modifiedTime);
int uploadStatus = el.attribute("uploadstatus", "1").toInt();
if (m_quickUpload || (forceUpload && uploadStatus == 0))
@@ -454,14 +454,14 @@ void ProjectUpload::upload()
if (!from.fileName(false).isEmpty() && fileItem)
{
emit eventHappened("before_upload", from.url(), to.url());
- KIO::FileCopyJob *job = KIO::file_copy( from, to, fileItem->permissions(), true, false, false );
+ TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),this,
- TQT_SLOT( uploadFinished( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( percent( KIO::Job *,unsigned long ) ),
- this, TQT_SLOT( uploadProgress( KIO::Job *,unsigned long ) ) );
- connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ),
- this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this,
+ TQT_SLOT( uploadFinished( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ),
+ this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ),
+ this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) );
labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
currentProgress->setProgress( 0 );
@@ -477,7 +477,7 @@ void ProjectUpload::upload()
reject();
}
-void ProjectUpload::uploadFinished( KIO::Job *job )
+void ProjectUpload::uploadFinished( TDEIO::Job *job )
{
if ( !job ) return;
@@ -489,18 +489,18 @@ void ProjectUpload::uploadFinished( KIO::Job *job )
saveRemoteUploadInfo();
return;
}
- KIO::FileCopyJob *fJob = dynamic_cast<KIO::FileCopyJob *>(job);
+ TDEIO::FileCopyJob *fJob = dynamic_cast<TDEIO::FileCopyJob *>(job);
if (fJob)
emit eventHappened("after_upload", fJob->srcURL().url(), fJob->destURL().url());
slotUploadNext();
}
-void ProjectUpload::uploadProgress ( KIO::Job *, unsigned long percent )
+void ProjectUpload::uploadProgress ( TDEIO::Job *, unsigned long percent )
{
currentProgress->setProgress( percent );
}
-void ProjectUpload::uploadMessage ( KIO::Job *, const TQString & msg )
+void ProjectUpload::uploadMessage ( TDEIO::Job *, const TQString & msg )
{
labelCurFile->setText( currentURL.fileName() + " : " + msg );
}
diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h
index 473f3e7e..bd341eec 100644
--- a/quanta/project/projectupload.h
+++ b/quanta/project/projectupload.h
@@ -56,9 +56,9 @@ public slots: // Public slots
protected slots:
void startUpload();
void upload();
- void uploadFinished( KIO::Job *job );
- void uploadProgress ( KIO::Job *job, unsigned long percent );
- void uploadMessage ( KIO::Job *, const TQString & msg );
+ void uploadFinished( TDEIO::Job *job );
+ void uploadProgress ( TDEIO::Job *job, unsigned long percent );
+ void uploadMessage ( TDEIO::Job *, const TQString & msg );
void slotUploadNext();
void clearSelection();
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index daa628a5..5f5ebc71 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -53,13 +53,13 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co
excludeRx = p_excludeRx;
progressText->setText(i18n("Reading folder:"));
- KIO::ListJob *job = KIO::listRecursive( baseURL, false );
+ TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false );
m_listJobCount = 1;
- connect( job, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)),
- this,TQT_SLOT (addEntries(KIO::Job *,const KIO::UDSEntryList &)));
- connect( job, TQT_SIGNAL(result(KIO::Job *)),
- this,TQT_SLOT (slotListDone(KIO::Job *)));
+ connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+ this,TQT_SLOT (slotListDone(TDEIO::Job *)));
connect( buttonSelect, TQT_SIGNAL(clicked()),
@@ -83,16 +83,16 @@ RescanPrj::~RescanPrj()
urlList.clear();
}
-void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
+void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list)
{
- KURL url = static_cast<KIO::ListJob *>(job)->url();
+ KURL url = static_cast<TDEIO::ListJob *>(job)->url();
url.adjustPath(-1);
// avoid creating these TQStrings again and again
static const TQString& dot = TDEGlobal::staticQString(".");
static const TQString& dotdot = TDEGlobal::staticQString("..");
- KIO::UDSEntryListConstIterator it = list.begin();
- KIO::UDSEntryListConstIterator end = list.end();
+ TDEIO::UDSEntryListConstIterator it = list.begin();
+ TDEIO::UDSEntryListConstIterator end = list.end();
KURL itemURL;
URLListEntry urlEntry;
TQString name;
@@ -148,13 +148,13 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
}
for (TQPtrList<KFileItem>::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it)
{
- KIO::ListJob *ljob = KIO::listRecursive( (*it)->url(), false );
+ TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false );
m_listJobCount++;
- connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)),
- this,TQT_SLOT (addEntries(KIO::Job *,const KIO::UDSEntryList &)));
- connect( ljob, TQT_SIGNAL(result(KIO::Job *)),
- this,TQT_SLOT (slotListDone(KIO::Job *)));
+ connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this,TQT_SLOT (slotListDone(TDEIO::Job *)));
}
}
@@ -220,7 +220,7 @@ KURL::List RescanPrj::files()
return r;
}
/** No descriptions */
-void RescanPrj::slotListDone(KIO::Job *)
+void RescanPrj::slotListDone(TDEIO::Job *)
{
m_listJobCount--;
// kdDebug(24000) << "slotListDone " << m_listJobCount << endl;
diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h
index bfc7b635..da3844ac 100644
--- a/quanta/project/rescanprj.h
+++ b/quanta/project/rescanprj.h
@@ -51,7 +51,7 @@ public slots:
KURL::List files();
- void addEntries(KIO::Job *,const KIO::UDSEntryList &);
+ void addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &);
private:
KURL baseURL;
@@ -62,7 +62,7 @@ private:
protected slots: // Protected slots
/** No descriptions */
- void slotListDone(KIO::Job *);
+ void slotListDone(TDEIO::Job *);
};
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 05:45:52 +0000