summaryrefslogtreecommitdiffstats
path: root/kmrml
diff options
context:
space:
mode:
Diffstat (limited to 'kmrml')
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.cpp2
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.h2
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp2
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp8
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h8
-rw-r--r--kmrml/kmrml/loader.cpp20
-rw-r--r--kmrml/kmrml/loader.h8
-rw-r--r--kmrml/kmrml/mrml.cpp8
-rw-r--r--kmrml/kmrml/mrml.h2
-rw-r--r--kmrml/kmrml/mrml_part.cpp36
-rw-r--r--kmrml/kmrml/mrml_part.h14
11 files changed, 55 insertions, 55 deletions
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 2a79cd5d..5d2ee154 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -44,7 +44,7 @@ typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
- KCModule(MrmlFactory::instance(), parent, name)
+ TDECModule(MrmlFactory::instance(), parent, name)
{
TDEAboutData* ab = new TDEAboutData(
"kcmkmrml",
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h
index 8ff7d971..23f233ef 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.h
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.h
@@ -28,7 +28,7 @@ namespace KMrmlConfig
{
class MainPage;
- class KCMKMrml : public KCModule
+ class KCMKMrml : public TDECModule
{
Q_OBJECT
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index b861cda4..a8a0ab84 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -176,7 +176,7 @@ void MainPage::save()
"kcmkmrml_no_directories_specified" );
if ( m_config->sync() )
- KIO::SlaveConfig::self()->reset();
+ TDEIO::SlaveConfig::self()->reset();
processIndexDirs( removedDirs );
}
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 63bc5e8a..be408bc2 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -54,13 +54,13 @@ const int DEFAULT_PORT = 12789;
Config::Config()
{
- m_ownConfig = new KConfig( "kio_mrmlrc", false, false );
+ m_ownConfig = new TDEConfig( "kio_mrmlrc", false, false );
m_config = m_ownConfig;
init();
}
-Config::Config( KConfig *config )
+Config::Config( TDEConfig *config )
: m_config( config ),
m_ownConfig( 0L )
{
@@ -98,7 +98,7 @@ bool Config::sync()
// mrmlsearch binary can also use this class)
// tell the ioslaves about the new configuration
// if ( notifySlaves )
-// KIO::SlaveConfig::self()->reset();
+// TDEIO::SlaveConfig::self()->reset();
}
void Config::setDefaultHost( const TQString& host )
@@ -117,7 +117,7 @@ ServerSettings Config::settingsForLocalHost() const
ServerSettings Config::settingsForHost( const TQString& host ) const
{
- KConfigGroup config( m_config, settingsGroup( host ) );
+ TDEConfigGroup config( m_config, settingsGroup( host ) );
ServerSettings settings;
settings.host = host;
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 2208030a..5a423360 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -19,7 +19,7 @@
#ifndef KMRML_CONFIG_H
#define KMRML_CONFIG_H
-class KConfig;
+class TDEConfig;
#include <tqstringlist.h>
#include <kurl.h>
@@ -57,7 +57,7 @@ namespace KMrml
{
public:
Config();
- Config( KConfig *config ); // does not take ownership of KConfig
+ Config( TDEConfig *config ); // does not take ownership of TDEConfig
~Config();
bool sync();
@@ -115,8 +115,8 @@ namespace KMrml
TQString m_defaultHost;
TQStringList m_hostList;
- KConfig *m_config;
- KConfig *m_ownConfig;
+ TDEConfig *m_config;
+ TDEConfig *m_ownConfig;
};
}
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index 7b806580..ec1d7cdd 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -58,21 +58,21 @@ void Loader::requestDownload( const KURL& url )
return;
}
- KIO::TransferJob *job = KIO::get( url, false, false );
- KIO::Scheduler::scheduleJob(job);
+ TDEIO::TransferJob *job = TDEIO::get( url, false, false );
+ TDEIO::Scheduler::scheduleJob(job);
- connect( job , TQT_SIGNAL( data( KIO::Job *, const TQByteArray& )),
- TQT_SLOT( slotData( KIO::Job *, const TQByteArray& )));
- connect( job , TQT_SIGNAL( result( KIO::Job * )),
- TQT_SLOT( slotResult( KIO::Job * )));
+ connect( job , TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray& )),
+ TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray& )));
+ connect( job , TQT_SIGNAL( result( TDEIO::Job * )),
+ TQT_SLOT( slotResult( TDEIO::Job * )));
Download *d = new Download();
m_downloads.insert( job, d );
}
-void Loader::slotData( KIO::Job *job, const TQByteArray& data )
+void Loader::slotData( TDEIO::Job *job, const TQByteArray& data )
{
- DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
+ DownloadIterator it = m_downloads.find( static_cast<TDEIO::TransferJob*>(job) );
if ( it != m_downloads.end() ) {
TQBuffer& buffer = it.data()->m_buffer;
if ( !buffer.isOpen() )
@@ -86,9 +86,9 @@ void Loader::slotData( KIO::Job *job, const TQByteArray& data )
}
}
-void Loader::slotResult( KIO::Job *job )
+void Loader::slotResult( TDEIO::Job *job )
{
- KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
+ TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>( job );
DownloadIterator it = m_downloads.find( tjob );
if ( it != m_downloads.end() ) {
diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h
index 031b7a1a..aa63823e 100644
--- a/kmrml/kmrml/loader.h
+++ b/kmrml/kmrml/loader.h
@@ -57,14 +57,14 @@ signals:
void finished( const KURL& url, const TQByteArray& );
private slots:
- void slotData( KIO::Job *, const TQByteArray& );
- void slotResult( KIO::Job * );
+ void slotData( TDEIO::Job *, const TQByteArray& );
+ void slotResult( TDEIO::Job * );
private:
Loader();
- TQMap<KIO::TransferJob*,Download*> m_downloads;
- typedef TQMapIterator<KIO::TransferJob*,Download*> DownloadIterator;
+ TQMap<TDEIO::TransferJob*,Download*> m_downloads;
+ typedef TQMapIterator<TDEIO::TransferJob*,Download*> DownloadIterator;
static Loader *s_self;
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 5fc30e8c..d6273c2c 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -92,7 +92,7 @@ void Mrml::get( const KURL& url )
if ( !checkLocalServer( url ) )
{
- error( KIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
+ error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unable to start the Indexing Server. "
"Aborting the query.") );
return;
}
@@ -117,7 +117,7 @@ tryConnect:
TQString meta = metaData( MrmlShared::mrml_data() );
if ( meta.isEmpty() ) {
closeDescriptor();
- error( KIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
+ error( TDEIO::ERR_SLAVE_DEFINED, i18n("No MRML data is available.") );
return;
}
@@ -148,7 +148,7 @@ tryConnect:
return;
}
- error( KIO::ERR_COULD_NOT_CONNECT,
+ error( TDEIO::ERR_COULD_NOT_CONNECT,
i18n("Could not connect to GIFT server.") );
return;
}
@@ -263,5 +263,5 @@ void Mrml::mimetype( const KURL& url )
finished();
}
else
- KIO::TCPSlaveBase::mimetype( url );
+ TDEIO::TCPSlaveBase::mimetype( url );
}
diff --git a/kmrml/kmrml/mrml.h b/kmrml/kmrml/mrml.h
index d0493168..13d3cde7 100644
--- a/kmrml/kmrml/mrml.h
+++ b/kmrml/kmrml/mrml.h
@@ -26,7 +26,7 @@
#include <kmrml_config.h>
#include "mrml_shared.h"
-class Mrml : public KIO::TCPSlaveBase
+class Mrml : public TDEIO::TCPSlaveBase
{
public:
Mrml( const TQCString&, const TQCString& );
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index c418ae67..33b5ea30 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -123,7 +123,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
setName( "MRML Part" );
m_browser = new Browser( this, "mrml browserextension");
setInstance( PartFactory::instance(), true ); // do load plugins :)
- KConfig *config = PartFactory::instance()->config();
+ TDEConfig *config = PartFactory::instance()->config();
config->setGroup("MRML Settings");
TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
@@ -341,10 +341,10 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
KURL destURL;
destURL.setPath( tmpFile.name() );
- KIO::FileCopyJob *job = KIO::file_copy( *it, destURL, -1,
+ TDEIO::FileCopyJob *job = TDEIO::file_copy( *it, destURL, -1,
true /* overwrite tmpfile */ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotDownloadResult( KIO::Job * ) ));
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotDownloadResult( TDEIO::Job * ) ));
m_downloadJobs.append( job );
// ### should this be only called for one job?
emit started( job );
@@ -361,7 +361,7 @@ bool MrmlPart::closeURL()
m_view->stopDownloads();
m_view->clear();
- TQPtrListIterator<KIO::FileCopyJob> it( m_downloadJobs );
+ TQPtrListIterator<TDEIO::FileCopyJob> it( m_downloadJobs );
for ( ; it.current(); ++it )
it.current()->kill();
m_downloadJobs.clear();
@@ -381,18 +381,18 @@ bool MrmlPart::closeURL()
return true;
}
-KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
+TDEIO::TransferJob * MrmlPart::transferJob( const KURL& url )
{
- KIO::TransferJob *job = KIO::get( url, true, false ); // reload, no gui
+ TDEIO::TransferJob *job = TDEIO::get( url, true, false ); // reload, no gui
job->setAutoErrorHandlingEnabled( true, m_view );
- 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& )));
// ###
-// connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString& )),
-// TQT_SLOT( slotResult( KIO::Job *, const TQString& )));
+// connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString& )),
+// TQT_SLOT( slotResult( TDEIO::Job *, const TQString& )));
job->setWindow( widget() );
if ( !m_sessionId.isEmpty() )
@@ -405,7 +405,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
return job;
}
-void MrmlPart::slotResult( KIO::Job *job )
+void MrmlPart::slotResult( TDEIO::Job *job )
{
if ( job == m_job )
m_job = 0L;
@@ -435,10 +435,10 @@ void MrmlPart::slotResult( KIO::Job *job )
}
// ### when user cancels download, we crash :(
-void MrmlPart::slotDownloadResult( KIO::Job *job )
+void MrmlPart::slotDownloadResult( TDEIO::Job *job )
{
- assert( job->inherits( "KIO::FileCopyJob" ) );
- KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*>( job );
+ assert( job->inherits( "TDEIO::FileCopyJob" ) );
+ TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*>( job );
if ( !copyJob->error() )
m_queryList.append( copyJob->destURL() );
@@ -457,7 +457,7 @@ void MrmlPart::slotDownloadResult( KIO::Job *job )
}
// mrml-document in the bytearray
-void MrmlPart::slotData( KIO::Job *, const TQByteArray& data )
+void MrmlPart::slotData( TDEIO::Job *, const TQByteArray& data )
{
if ( data.isEmpty() )
return;
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 7efa4e95..605d23e7 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -38,7 +38,7 @@ class TDEAboutData;
class KComboBox;
class KIntNumInput;
-namespace KIO {
+namespace TDEIO {
class FileCopyJob;
class TransferJob;
}
@@ -94,10 +94,10 @@ private slots:
void slotSetStatusBar( const KURL& url ) { slotSetStatusBar( url.prettyURL() ); }
void slotHostComboActivated( const TQString& );
- void slotResult( KIO::Job * );
- void slotData( KIO::Job *, const TQByteArray& );
+ void slotResult( TDEIO::Job * );
+ void slotData( TDEIO::Job *, const TQByteArray& );
- void slotDownloadResult( KIO::Job * );
+ void slotDownloadResult( TDEIO::Job * );
void slotConfigureAlgorithm();
void slotApplyAlgoConfig();
@@ -111,7 +111,7 @@ private:
void parseMrml( TQDomDocument& doc );
void parseQueryResult( TQDomElement& );
void enableExtensionActions( const KURL& url, bool enable );
- KIO::TransferJob * transferJob( const KURL& url );
+ TDEIO::TransferJob * transferJob( const KURL& url );
void initHostCombo();
void enableServerDependentWidgets( bool enable );
@@ -121,7 +121,7 @@ private:
void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );
- KIO::TransferJob *m_job;
+ TDEIO::TransferJob *m_job;
MrmlView *m_view;
Config m_config;
KIntNumInput * m_resultSizeInput;
@@ -134,7 +134,7 @@ private:
AlgorithmDialog *m_algoConfig;
KComboBox *m_hostCombo;
- TQPtrList<KIO::FileCopyJob> m_downloadJobs;
+ TQPtrList<TDEIO::FileCopyJob> m_downloadJobs;
TQStringList m_tempFiles;
TQString m_sessionId;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 18:24:16 +0000