summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget.cpp20
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget.h32
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget_p.h4
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp4
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h8
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp2
-rw-r--r--lib/compatibility/kmdi/qextmdi/ktabwidget.cpp2
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.cpp26
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.h12
-rw-r--r--lib/compatibility/knewstuff/engine.cpp46
-rw-r--r--lib/compatibility/knewstuff/engine.h18
-rw-r--r--lib/compatibility/knewstuff/knewstuffgeneric.h4
-rw-r--r--lib/compatibility/knewstuff/knewstuffsecure.cpp10
-rw-r--r--lib/compatibility/knewstuff/provider.cpp16
-rw-r--r--lib/compatibility/knewstuff/provider.h6
-rw-r--r--lib/compatibility/knewstuff/uploaddialog.cpp4
-rw-r--r--lib/qextfileinfo.cpp100
-rw-r--r--lib/qextfileinfo.h12
18 files changed, 163 insertions, 163 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index 92fc9ba3..47e2d71d 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -165,12 +165,12 @@ void KDockMainWindow::readDockConfig(TQDomElement &base)
}
#ifndef NO_KDE2
-void KDockMainWindow::writeDockConfig( KConfig* c, TQString group )
+void KDockMainWindow::writeDockConfig( TDEConfig* c, TQString group )
{
dockManager->writeConfig( c, group );
}
-void KDockMainWindow::readDockConfig( KConfig* c, TQString group )
+void KDockMainWindow::readDockConfig( TDEConfig* c, TQString group )
{
dockManager->readConfig( c, group );
}
@@ -423,12 +423,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
}
#ifndef NO_KDE2
-void KDockWidgetHeader::saveConfig( KConfig* c )
+void KDockWidgetHeader::saveConfig( TDEConfig* c )
{
c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
}
-void KDockWidgetHeader::loadConfig( KConfig* c )
+void KDockWidgetHeader::loadConfig( TDEConfig* c )
{
setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
}
@@ -2474,7 +2474,7 @@ void KDockManager::setReadDockConfigMode(int mode)
}
#ifndef NO_KDE2
-void KDockManager::writeConfig( KConfig* c, TQString group )
+void KDockManager::writeConfig( TDEConfig* c, TQString group )
{
//debug("BEGIN Write Config");
if ( !c ) c = TDEGlobal::config();
@@ -2616,7 +2616,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
//debug("END Write Config");
}
#include <tqmessagebox.h>
-void KDockManager::readConfig( KConfig* c, TQString group )
+void KDockManager::readConfig( TDEConfig* c, TQString group )
{
if ( !c ) c = TDEGlobal::config();
if ( group.isEmpty() ) group = "dock_setting_default";
@@ -3075,12 +3075,12 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
}
#ifndef NO_KDE2
-void KDockArea::writeDockConfig( KConfig* c, TQString group )
+void KDockArea::writeDockConfig( TDEConfig* c, TQString group )
{
dockManager->writeConfig( c, group );
}
-void KDockArea::readDockConfig( KConfig* c, TQString group )
+void KDockArea::readDockConfig( TDEConfig* c, TQString group )
{
dockManager->readConfig( c, group );
}
@@ -3205,8 +3205,8 @@ void KDockContainer::removeWidget (KDockWidget *dw){
void KDockContainer::undockWidget (KDockWidget *){;}
void KDockContainer::setToolTip(KDockWidget *, TQString &){;}
void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;}
-void KDockContainer::load (KConfig*, const TQString&){;}
-void KDockContainer::save (KConfig*, const TQString&){;}
+void KDockContainer::load (TDEConfig*, const TQString&){;}
+void KDockContainer::save (TDEConfig*, const TQString&){;}
void KDockContainer::load (TQDomElement&){;}
void KDockContainer::save (TQDomElement&){;}
void KDockContainer::prepareSave(TQStringList &names)
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index d0cb5681..5b355867 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -83,7 +83,7 @@ class TQPixmap;
#ifndef NO_KDE2
class KToolBar;
-class KConfig;
+class TDEConfig;
#else
class TQToolBar;
#endif
@@ -130,12 +130,12 @@ public:
/**
* Provides saving the current configuration. Must be overridden by an inheriting class.
*/
- virtual void saveConfig( KConfig* ){};
+ virtual void saveConfig( TDEConfig* ){};
/**
* Provides loading the current configuration. Must be overridden by an inheriting class
*/
- virtual void loadConfig( KConfig* ){};
+ virtual void loadConfig( TDEConfig* ){};
#endif
protected:
@@ -293,14 +293,14 @@ public:
*
* @param c the configuration safe
*/
- virtual void saveConfig( KConfig* c);
+ virtual void saveConfig( TDEConfig* c);
/**
* Loads the current button state from a KDE config container object.
*
* @param c the configuration safe
*/
- virtual void loadConfig( KConfig* c);
+ virtual void loadConfig( TDEConfig* c);
#endif
/*@since 3.2
@@ -903,7 +903,7 @@ private:
* that can be called within a KDockMainWindow or a KDockWidget .
*
* An important feature is the ability to read or save the current state of all things concerning to
- * dockwidgets to KConfig .
+ * dockwidgets to TDEConfig .
*
* The dockmanager is also often used when a certain dockwidget or a child of such dockwidget must be found.
*
@@ -951,9 +951,9 @@ public:
* last but not least some necessary things for recovering the dockmainwindow state.
*
* @param c the KDE configuration saver
- * @param group the name of the section in KConfig
+ * @param group the name of the section in TDEConfig
*/
- void writeConfig( KConfig* c = 0L, TQString group = TQString() );
+ void writeConfig( TDEConfig* c = 0L, TQString group = TQString() );
/**
* Like writeConfig but reads the whole stuff in.
@@ -969,9 +969,9 @@ public:
* to work, each widget must have a unique name.
*
* @param c the KDE configuration saver
- * @param group the name of the section in KConfig
+ * @param group the name of the section in TDEConfig
*/
- void readConfig ( KConfig* c = 0L, TQString group = TQString() );
+ void readConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif
/// @since 3.1
@@ -1381,20 +1381,20 @@ public:
#ifndef NO_KDE2
/**
- * It writes the current dock state in the given section of KConfig.
+ * It writes the current dock state in the given section of TDEConfig.
*
* @param c KDE class for saving configurations
* @param group name of section to write to
*/
- void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
+ void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() );
/**
- * It reads the current dock state from the given section of KConfig.
+ * It reads the current dock state from the given section of TDEConfig.
*
* @param c KDE class for saving configurations
* @param group name of section to read from
*/
- void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
+ void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif
/**
@@ -1500,8 +1500,8 @@ public:
void readDockConfig(TQDomElement &base);
#ifndef NO_KDE2
- void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
- void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
+ void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() );
+ void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() );
#endif
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
index 9ee9e8e7..471c4d9b 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
@@ -50,9 +50,9 @@ public:
virtual void showWidget(KDockWidget *);
virtual void removeWidget(KDockWidget*);
virtual void undockWidget(KDockWidget*);
- virtual void save(KConfig *cfg,const TQString& group_or_prefix);
+ virtual void save(TDEConfig *cfg,const TQString& group_or_prefix);
virtual void save(TQDomElement& dockElement);
- virtual void load(KConfig *cfg,const TQString& group_or_prefix);
+ virtual void load(TDEConfig *cfg,const TQString& group_or_prefix);
virtual void load(TQDomElement& dockElement);
virtual void setToolTip (KDockWidget *, TQString &);
virtual void setPixmap(KDockWidget*,const TQPixmap&);
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index 4fde9799..173cb723 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -621,7 +621,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
}
-void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
{
TQString grp = cfg->group();
cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
@@ -669,7 +669,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
}
-void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
{
TQString grp = cfg->group();
cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
index 5ada8db6..5f1f5dcc 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
@@ -89,22 +89,22 @@ public:
void hideIfNeeded();
/**
- * Save the config using a KConfig object
+ * Save the config using a TDEConfig object
*
* The combination of the group_or_prefix variable and the parent
* dockwidget's name will be the group the configuration is saved in
* \param group_or_prefix the prefix to append to the parent dockwidget's name
*/
- virtual void save( KConfig *, const TQString& group_or_prefix );
+ virtual void save( TDEConfig *, const TQString& group_or_prefix );
/**
- * Load the config using a KConfig object
+ * Load the config using a TDEConfig object
*
* The combination of the group_or_prefix variable and the parent
* dockwidget's name will be the group the configuration is loaded from
* \param group_or_prefix the prefix to append to the parent dockwidget's name
*/
- virtual void load( KConfig *, const TQString& group_or_prefix );
+ virtual void load( TDEConfig *, const TQString& group_or_prefix );
/**
* Save the config to a TQDomElement
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
index 494f3bca..34c25f0d 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
@@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
// try to read the action shortcut
KShortcut sc;
- KConfig *cfg = kapp->config();
+ TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup( "Shortcuts" );
// if ( cfg->hasKey( aname ) )
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index 39b7678e..2320fb90 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -41,7 +41,7 @@ public:
KTabWidgetPrivate() {
m_automaticResizeTabs = false;
- KConfigGroupSaver groupsaver(TDEGlobal::config(), "General");
+ TDEConfigGroupSaver groupsaver(TDEGlobal::config(), "General");
m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30);
m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3);
m_CurrentMaxLength = m_minLength;
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index d2516134..c5f402e1 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -195,7 +195,7 @@ void DownloadDialog::addProvider(Provider *p)
ret = true;
if(!p->icon().isValid()) ret = false;
- else ret = KIO::NetAccess::download(p->icon(), tmp, this);
+ else ret = TDEIO::NetAccess::download(p->icon(), tmp, this);
if(ret) pix = TQPixmap(tmp);
else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel);
frame = addPage(p->name(), p->name(), pix);
@@ -280,7 +280,7 @@ void DownloadDialog::addProvider(Provider *p)
TQTimer::singleShot(100, this, TQT_SLOT(slotFinish()));
}
-void DownloadDialog::slotResult(KIO::Job *job)
+void DownloadDialog::slotResult(TDEIO::Job *job)
{
TQDomDocument dom;
TQDomElement knewstuff;
@@ -379,7 +379,7 @@ void DownloadDialog::addEntry(Entry *entry)
kdDebug() << "added entry " << entry->name() << endl;
}
-void DownloadDialog::slotData(KIO::Job *job, const TQByteArray &a)
+void DownloadDialog::slotData(TDEIO::Job *job, const TQByteArray &a)
{
TQCString tmp(a, a.size() + 1);
m_data[job].append(TQString::fromUtf8(tmp));
@@ -446,8 +446,8 @@ void DownloadDialog::slotInstall()
KURL source = e->payload();
KURL dest = KURL(m_s->downloadDestination(e));
- KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, true);
- connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotInstalled(KIO::Job*)));
+ TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*)));
}
}
@@ -471,14 +471,14 @@ void DownloadDialog::install(Entry *e)
if(in) in->setEnabled(false);
}
-void DownloadDialog::slotInstalled(KIO::Job *job)
+void DownloadDialog::slotInstalled(TDEIO::Job *job)
{
bool ret = (job->error() == 0);
- KIO::FileCopyJob *cjob;
+ TDEIO::FileCopyJob *cjob;
if(ret)
{
- cjob = static_cast<KIO::FileCopyJob*>(job);
+ cjob = static_cast<TDEIO::FileCopyJob*>(job);
if(cjob)
{
ret = m_s->install(cjob->destURL().path());
@@ -519,7 +519,7 @@ void DownloadDialog::slotSelected()
}
else
{
- KIO::NetAccess::download(e->preview(lang), tmp, this);
+ TDEIO::NetAccess::download(e->preview(lang), tmp, this);
m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><img src='%4'><br><i>%5</i><br>(%6)").arg(
e->name()).arg(e->author()).arg(TDEGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license()));
}
@@ -585,13 +585,13 @@ void DownloadDialog::slotPage(TQWidget *w)
void DownloadDialog::loadProvider(Provider *p)
{
- KIO::TransferJob *job = KIO::get(p->downloadUrl());
+ TDEIO::TransferJob *job = TDEIO::get(p->downloadUrl());
m_jobs[job] = p;
- connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)));
- connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+ connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
}
void DownloadDialog::setType(TQString type)
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index 2a0b729d..3c7257d7 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -23,7 +23,7 @@
#include <kdialogbase.h>
#include <knewstuff/provider.h>
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -193,11 +193,11 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
void slotOk();
private slots:
- void slotResult(KIO::Job *job);
- void slotData(KIO::Job *job, const TQByteArray &a);
+ void slotResult(TDEIO::Job *job);
+ void slotData(TDEIO::Job *job, const TQByteArray &a);
void slotInstall();
void slotDetails();
- void slotInstalled(KIO::Job *job);
+ void slotInstalled(TDEIO::Job *job);
void slotTab(int tab);
void slotSelected();
void slotPage(TQWidget *w);
@@ -224,8 +224,8 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
TQMap<TQWidget*, Provider*> m_providers;
TQMap<TQWidget*, TQTextBrowser*> m_rts;
TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons;
- TQMap<KIO::Job*, Provider*> m_jobs;
- TQMap<KIO::Job*, TQString> m_data;
+ TQMap<TDEIO::Job*, Provider*> m_jobs;
+ TQMap<TDEIO::Job*, TQString> m_data;
TQString m_filter;
TQString m_providerlist;
Engine *m_engine;
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index ca63ea98..2abb7bca 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -96,18 +96,18 @@ void Engine::getMetaInformation( Provider::List *providers )
for ( p = providers->first(); p; p = providers->next() ) {
if ( p->downloadUrl().isEmpty() ) continue;
- KIO::TransferJob *job = KIO::get( p->downloadUrl() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotNewStuffJobResult( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotNewStuffJobData( KIO::Job *, const TQByteArray & ) ) );
+ TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl() );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
mNewStuffJobData.insert( job, "" );
mProviderJobs[ job ] = p;
}
}
-void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data )
+void Engine::slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data )
{
if ( data.isEmpty() ) return;
@@ -118,7 +118,7 @@ void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data )
mNewStuffJobData[ job ].append( TQString::fromUtf8( str ) );
}
-void Engine::slotNewStuffJobResult( KIO::Job *job )
+void Engine::slotNewStuffJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
kdDebug(5850) << "Error downloading new stuff descriptions." << endl;
@@ -192,12 +192,12 @@ void Engine::download( Entry *entry )
kdDebug(5850) << " SOURCE: " << source.url() << endl;
kdDebug(5850) << " DESTINATION: " << destination.url() << endl;
- KIO::FileCopyJob *job = KIO::file_copy( source, destination, -1, true );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotDownloadJobResult( KIO::Job * ) ) );
+ TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
}
-void Engine::slotDownloadJobResult( KIO::Job *job )
+void Engine::slotDownloadJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
kdDebug(5850) << "Error downloading new stuff payload." << endl;
@@ -313,9 +313,9 @@ void Engine::upload( Entry *entry )
KURL destination = mUploadProvider->uploadUrl();
destination.setFileName( fi.fileName() );
- KIO::FileCopyJob *job = KIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotUploadPayloadJobResult( KIO::Job * ) ) );
+ TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
} else {
emit uploadFinished( false );
}
@@ -356,7 +356,7 @@ bool Engine::createMetaFile( Entry *entry )
return true;
}
-void Engine::slotUploadPayloadJobResult( KIO::Job *job )
+void Engine::slotUploadPayloadJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
kdDebug(5850) << "Error uploading new stuff payload." << endl;
@@ -375,12 +375,12 @@ void Engine::slotUploadPayloadJobResult( KIO::Job *job )
KURL previewDestination = mUploadProvider->uploadUrl();
previewDestination.setFileName( fi.fileName() );
- KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
- connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotUploadPreviewJobResult( KIO::Job * ) ) );
+ TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
+ connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
}
-void Engine::slotUploadPreviewJobResult( KIO::Job *job )
+void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
kdDebug(5850) << "Error uploading new stuff preview." << endl;
@@ -394,12 +394,12 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job )
KURL metaDestination = mUploadProvider->uploadUrl();
metaDestination.setFileName( fi.fileName() );
- KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
- connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotUploadMetaJobResult( KIO::Job * ) ) );
+ TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
+ connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
}
-void Engine::slotUploadMetaJobResult( KIO::Job *job )
+void Engine::slotUploadMetaJobResult( TDEIO::Job *job )
{
mUploadMetaFile = TQString();
if ( job->error() ) {
diff --git a/lib/compatibility/knewstuff/engine.h b/lib/compatibility/knewstuff/engine.h
index 5362351d..4341dd21 100644
--- a/lib/compatibility/knewstuff/engine.h
+++ b/lib/compatibility/knewstuff/engine.h
@@ -27,7 +27,7 @@
#include "entry.h"
#include "provider.h"
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KNewStuff;
@@ -143,14 +143,14 @@ class Engine : public TQObject
void getMetaInformation( Provider::List *providers );
void selectUploadProvider( Provider::List *providers );
- void slotNewStuffJobData( KIO::Job *job, const TQByteArray &data );
- void slotNewStuffJobResult( KIO::Job *job );
+ void slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data );
+ void slotNewStuffJobResult( TDEIO::Job *job );
- void slotDownloadJobResult( KIO::Job *job );
+ void slotDownloadJobResult( TDEIO::Job *job );
- void slotUploadPayloadJobResult( KIO::Job *job );
- void slotUploadPreviewJobResult (KIO::Job *job );
- void slotUploadMetaJobResult( KIO::Job *job );
+ void slotUploadPayloadJobResult( TDEIO::Job *job );
+ void slotUploadPreviewJobResult (TDEIO::Job *job );
+ void slotUploadMetaJobResult( TDEIO::Job *job );
protected:
bool createMetaFile( Entry * );
@@ -160,8 +160,8 @@ class Engine : public TQObject
ProviderLoader *mProviderLoader;
- TQMap<KIO::Job *,TQString> mNewStuffJobData;
- TQMap<KIO::Job *,Provider *> mProviderJobs;
+ TQMap<TDEIO::Job *,TQString> mNewStuffJobData;
+ TQMap<TDEIO::Job *,Provider *> mProviderJobs;
TQPtrList<Entry> mNewStuffList;
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.h b/lib/compatibility/knewstuff/knewstuffgeneric.h
index 6347bf53..053f83a0 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.h
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.h
@@ -23,7 +23,7 @@
#include "knewstuff.h"
-class KConfig;
+class TDEConfig;
/**
* @short Basic KNewStuff class with predefined actions.
@@ -80,7 +80,7 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff
private:
TQString destinationPath( KNS::Entry *entry );
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
#endif
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index 8e408e2d..3c90f068 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result)
emit installFinished();
} else
{
- KConfig *cfg = TDEGlobal::config();
+ TDEConfig *cfg = TDEGlobal::config();
cfg->deleteGroup("KNewStuffStatus");
cfg->setGroup("KNewStuffStatus");
for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it)
@@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result)
void KNewStuffSecure::downloadResource()
{
- KConfig *cfg = TDEGlobal::config();
+ TDEConfig *cfg = TDEGlobal::config();
m_installedResources = cfg->entryMap("KNewStuffStatus");
engine()->ignoreInstallResult(true);
KNewStuff::download();
@@ -179,7 +179,7 @@ void KNewStuffSecure::uploadResource(const TQString& fileName)
m_tempDir->setAutoDelete(true);
TQFileInfo f(fileName);
m_signedFileName = m_tempDir->name() + "/" + f.fileName();
- KIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true);
+ TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true);
Security::ref()->signFile(m_signedFileName);
}
@@ -215,7 +215,7 @@ void KNewStuffSecure::slotFileSigned(int result)
file.close();
}
tar.close();
- KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
+ TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
KNewStuff::upload(m_signedFileName, TQString());
disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
}
@@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory()
{
if (m_tempDir)
{
- KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
+ TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
delete m_tempDir;
m_tempDir = 0L;
}
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 67a44ebd..92be65b6 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -154,7 +154,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
mProviders.clear();
mJobData = "";
- KConfig *cfg = TDEGlobal::config();
+ TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup("KNewStuff");
TQString providersUrl = providersList;
@@ -171,16 +171,16 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
kdDebug(5850) << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
- KIO::TransferJob *job = KIO::get( KURL( providersUrl ) );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotJobResult( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+ TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
// job->dumpObjectInfo();
}
-void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data )
+void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data )
{
kdDebug(5850) << "ProviderLoader::slotJobData()" << endl;
@@ -191,7 +191,7 @@ void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data )
mJobData.append( TQString::fromUtf8( str ) );
}
-void ProviderLoader::slotJobResult( KIO::Job *job )
+void ProviderLoader::slotJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
job->showErrorDialog( mParentWidget );
diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h
index 268bd92b..630568e4 100644
--- a/lib/compatibility/knewstuff/provider.h
+++ b/lib/compatibility/knewstuff/provider.h
@@ -28,7 +28,7 @@
#include <kurl.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
namespace KNS {
@@ -191,8 +191,8 @@ class ProviderLoader : public TQObject
void providersLoaded( Provider::List * );
protected slots:
- void slotJobData( KIO::Job *, const TQByteArray & );
- void slotJobResult( KIO::Job * );
+ void slotJobData( TDEIO::Job *, const TQByteArray & );
+ void slotJobResult( TDEIO::Job * );
private:
TQWidget *mParentWidget;
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 12261d71..9e6ae83a 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -100,7 +100,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) :
mSummaryEdit = new KTextEdit( topPage );
topLayout->addMultiCellWidget( mSummaryEdit, 8, 8, 0, 1 );
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("KNewStuffUpload");
TQString name = conf->readEntry("name");
TQString author = conf->readEntry("author");
@@ -152,7 +152,7 @@ void UploadDialog::slotOk()
entry->setPreview( KURL( mPreviewUrl->url().section("/", -1) ), mLanguageCombo->currentText() );
entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() );
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("KNewStuffUpload");
conf->writeEntry("name", mNameEdit->text());
conf->writeEntry("author", mAuthorEdit->text());
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index f701fb5a..3aaf5e1b 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -214,7 +214,7 @@ bool QExtFileInfo::createDir(const KURL& path, TQWidget *window)
}
dir3 = dir2;
dir3.adjustPath(-1); //some servers refuse to create directories ending with a slash
- result = KIO::NetAccess::mkdir(dir3, window);
+ result = TDEIO::NetAccess::mkdir(dir3, window);
if (dir2.path() == "/" || !result)
break;
i++;
@@ -259,7 +259,7 @@ bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window)
{
// Andras: Don't use it now, as it brings up an extra dialog and need manual
// intervention when usign fish
-// return KIO::NetAccess::exists(a_url, false);
+// return TDEIO::NetAccess::exists(a_url, false);
// No dialog when stating.
if (a_url.isLocalFile())
@@ -297,13 +297,13 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
lstFilters.append( new TQRegExp(*it, false, true ) );
bJobOK = true;
- KIO::ListJob *job = KIO::listRecursive(startURL, false, true);
+ TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true);
job->setWindow(window);
m_listJobCount = 1;
- connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)),
- this, TQT_SLOT(slotNewEntries(KIO::Job *, const KIO::UDSEntryList&)));
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotListResult (KIO::Job *) ) );
+ connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
+ this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotListResult (TDEIO::Job *) ) );
m_listStartURL = startURL.url();
//kdDebug(24000) << "Now listing: " << startURL.url() << endl;
@@ -335,13 +335,13 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
lstFilters.append( new TQRegExp(*it, false, true ) );
bJobOK = true;
- KIO::ListJob *job = KIO::listRecursive(startURL, false, true);
+ TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true);
job->setWindow(window);
m_listJobCount = 1;
- connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)),
- this, TQT_SLOT(slotNewDetailedEntries(KIO::Job *, const KIO::UDSEntryList&)));
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotListResult (KIO::Job *) ) );
+ connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)),
+ this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&)));
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotListResult (TDEIO::Job *) ) );
m_listStartURL = startURL.url();
//kdDebug(24000) << "Now listing: " << startURL.url() << endl;
enter_loop();
@@ -385,7 +385,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString
}
-//Some hackery from KIO::NetAccess as they do not do exactly what we want
+//Some hackery from TDEIO::NetAccess as they do not do exactly what we want
/* return true if the url exists*/
bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *window)
{
@@ -393,12 +393,12 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w
KURL url2 = url;
url2.adjustPath(-1);
// kdDebug(24000)<<"QExtFileInfo::internalExists"<<endl;
- KIO::StatJob * job = KIO::stat(url2, false);
+ TDEIO::StatJob * job = TDEIO::stat(url2, false);
job->setWindow(window);
job->setDetails(0);
job->setSide(readingOnly);
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotResult (KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
//To avoid lock-ups, start a timer.
TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout()));
@@ -413,21 +413,21 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
{
bJobOK = true; // success unless further error occurs
- KIO::Scheduler::checkSlaveOnHold(true);
- KIO::Job * job = KIO::file_copy( src, target, permissions, overwrite, resume, false );
-// KIO::Job * job2 = KIO::del(target, false );
+ TDEIO::Scheduler::checkSlaveOnHold(true);
+ TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false );
+// TDEIO::Job * job2 = TDEIO::del(target, false );
//job2->setWindow (window);
- //connect( job2, TQT_SIGNAL( result (KIO::Job *) ),
-// this, TQT_SLOT( slotResult (KIO::Job *) ) );
+ //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ),
+// this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
//enter_loop();
//if (bJobOK)
{
// kdDebug(24000) << "Copying " << src << " to " << target << endl;
- // KIO::Job *job = KIO::copy( src, target, false );
+ // TDEIO::Job *job = TDEIO::copy( src, target, false );
job->setWindow (window);
- connect( job, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotResult (KIO::Job *) ) );
+ connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
enter_loop();
}
return bJobOK;
@@ -448,14 +448,14 @@ void QExtFileInfo::enter_loop()
tqt_leave_modal(&dummy);
}
-void QExtFileInfo::slotListResult(KIO::Job *job)
+void QExtFileInfo::slotListResult(TDEIO::Job *job)
{
m_listJobCount--;
if (m_listJobCount == 0)
slotResult(job);
}
-void QExtFileInfo::slotResult(KIO::Job *job)
+void QExtFileInfo::slotResult(TDEIO::Job *job)
{
//kdDebug(24000)<<"QExtFileInfo::slotResult"<<endl;
bJobOK = !job->error();
@@ -464,21 +464,21 @@ void QExtFileInfo::slotResult(KIO::Job *job)
if ( !lastErrorMsg )
lastErrorMsg = job->errorString();
}
- if ( job->isA("KIO::StatJob") )
- m_entry = static_cast<KIO::StatJob *>(job)->statResult();
+ if ( job->isA("TDEIO::StatJob") )
+ m_entry = static_cast<TDEIO::StatJob *>(job)->statResult();
tqApp->exit_loop();
}
-void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList)
{
- 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 = udsList.begin();
- KIO::UDSEntryListConstIterator end = udsList.end();
+ TDEIO::UDSEntryListConstIterator it = udsList.begin();
+ TDEIO::UDSEntryListConstIterator end = udsList.end();
KURL itemURL;
TQPtrList<KFileItem> linkItems;
linkItems.setAutoDelete(true);
@@ -487,9 +487,9 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis
TQString name;
// find out about the name
- KIO::UDSEntry::ConstIterator entit = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator entit = (*it).begin();
for( ; entit != (*it).end(); ++entit )
- if ((*entit).m_uds == KIO::UDS_NAME)
+ if ((*entit).m_uds == TDEIO::UDS_NAME)
{
name = (*entit).m_str;
break;
@@ -533,26 +533,26 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis
}
for (TQPtrList<KFileItem>::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it)
{
- KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true);
+ TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true);
m_listJobCount++;
//kdDebug(24000) << "Now listing: " << (*it)->url() << endl;
- connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)),
- this,TQT_SLOT (slotNewEntries(KIO::Job *,const KIO::UDSEntryList &)));
- connect( ljob, TQT_SIGNAL(result(KIO::Job *)),
- this,TQT_SLOT (slotListResult(KIO::Job *)));
+ connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this,TQT_SLOT (slotListResult(TDEIO::Job *)));
}
}
-void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList)
{
- 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 = udsList.begin();
- KIO::UDSEntryListConstIterator end = udsList.end();
+ TDEIO::UDSEntryListConstIterator it = udsList.begin();
+ TDEIO::UDSEntryListConstIterator end = udsList.end();
KURL itemURL;
TQPtrList<KFileItem> linkItems;
linkItems.setAutoDelete(true);
@@ -561,9 +561,9 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList
TQString name;
// find out about the name
- KIO::UDSEntry::ConstIterator entit = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator entit = (*it).begin();
for( ; entit != (*it).end(); ++entit )
- if ((*entit).m_uds == KIO::UDS_NAME)
+ if ((*entit).m_uds == TDEIO::UDS_NAME)
{
name = (*entit).m_str;
break;
@@ -600,13 +600,13 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList
}
for (TQPtrList<KFileItem>::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it)
{
- KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true);
+ TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true);
m_listJobCount++;
// kdDebug(24000) << "Now listing: " << (*it)->url() << endl;
- connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)),
- this,TQT_SLOT (slotNewDetailedEntries(KIO::Job *,const KIO::UDSEntryList &)));
- connect( ljob, TQT_SIGNAL(result(KIO::Job *)),
- this,TQT_SLOT (slotListResult(KIO::Job *)));
+ connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)),
+ this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &)));
+ connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)),
+ this,TQT_SLOT (slotListResult(TDEIO::Job *)));
}
}
diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h
index 488e4e5b..1fbe1093 100644
--- a/lib/qextfileinfo.h
+++ b/lib/qextfileinfo.h
@@ -77,7 +77,7 @@ public:
static KURL path(const KURL &);
/** Returns the user's home directory as an url. */
static KURL home();
- /** A slightly better working alternative of KIO::NetAccess::exists().
+ /** A slightly better working alternative of TDEIO::NetAccess::exists().
Checks for the existance of the url. readingOnly is true if we check if
the url is readable, and false if we check if it is writable.*/
static bool exists(const KURL& url, bool readingOnly, TQWidget *window);
@@ -99,7 +99,7 @@ private:
bool bJobOK;
static TQString lastErrorMsg;
- KIO::UDSEntry m_entry;
+ TDEIO::UDSEntry m_entry;
KURL::List dirListItems;
TQDict<KFileItem> detailedDirListItems;
TQPtrList<TQRegExp> lstFilters;
@@ -107,10 +107,10 @@ private:
TQString m_listStartURL;
private slots:
- void slotListResult(KIO::Job *job);
- void slotResult(KIO::Job * job);
- void slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList);
- void slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList);
+ void slotListResult(TDEIO::Job *job);
+ void slotResult(TDEIO::Job * job);
+ void slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList);
+ void slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList);
public slots:
/** Timeout occurred while waiting for some network function to return. */
void slotTimeout();
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 15:03:12 +0000