summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/favicons/favicons.cpp24
-rw-r--r--libkonq/favicons/favicons.h8
-rw-r--r--libkonq/knewmenu.cc28
-rw-r--r--libkonq/knewmenu.h6
-rw-r--r--libkonq/konq_dirpart.cc6
-rw-r--r--libkonq/konq_dirpart.h2
-rw-r--r--libkonq/konq_events.h8
-rw-r--r--libkonq/konq_filetip.cc4
-rw-r--r--libkonq/konq_filetip.h2
-rw-r--r--libkonq/konq_historymgr.cc12
-rw-r--r--libkonq/konq_iconviewwidget.cc16
-rw-r--r--libkonq/konq_iconviewwidget.h4
-rw-r--r--libkonq/konq_operations.cc100
-rw-r--r--libkonq/konq_operations.h16
-rw-r--r--libkonq/konq_pixmapprovider.cc4
-rw-r--r--libkonq/konq_pixmapprovider.h10
-rw-r--r--libkonq/konq_popupmenu.cc10
-rw-r--r--libkonq/konq_popupmenu.h4
-rw-r--r--libkonq/konq_propsview.cc42
-rw-r--r--libkonq/konq_propsview.h12
-rw-r--r--libkonq/konq_settings.cc12
-rw-r--r--libkonq/konq_settings.h6
-rw-r--r--libkonq/konq_undo.cc48
-rw-r--r--libkonq/konq_undo.h12
24 files changed, 198 insertions, 198 deletions
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index ed4cd39b5..1bf9feb83 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -45,11 +45,11 @@ struct FaviconsModulePrivate
bool isHost;
TQByteArray iconData;
};
- TQMap<KIO::Job *, DownloadInfo> downloads;
+ TQMap<TDEIO::Job *, DownloadInfo> downloads;
TQStringList failedDownloads;
KSimpleConfig *config;
- TQPtrList<KIO::Job> killJobs;
- KIO::MetaData metaData;
+ TQPtrList<TDEIO::Job> killJobs;
+ TDEIO::MetaData metaData;
TQString faviconsDir;
TQCache<TQString> faviconsCache;
};
@@ -184,18 +184,18 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const
if (d->failedDownloads.contains(iconURL.url()))
return;
- KIO::Job *job = KIO::get(iconURL, false, false);
+ TDEIO::Job *job = TDEIO::get(iconURL, false, false);
job->addMetaData(d->metaData);
- 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(infoMessage(KIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &)));
+ 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 *)));
+ connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
FaviconsModulePrivate::DownloadInfo download;
download.hostOrURL = hostOrURL;
download.isHost = isHost;
d->downloads.insert(job, download);
}
-void FaviconsModule::slotData(KIO::Job *job, const TQByteArray &data)
+void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data)
{
FaviconsModulePrivate::DownloadInfo &download = d->downloads[job];
unsigned int oldSize = download.iconData.size();
@@ -208,11 +208,11 @@ void FaviconsModule::slotData(KIO::Job *job, const TQByteArray &data)
memcpy(download.iconData.data() + oldSize, data.data(), data.size());
}
-void FaviconsModule::slotResult(KIO::Job *job)
+void FaviconsModule::slotResult(TDEIO::Job *job)
{
FaviconsModulePrivate::DownloadInfo download = d->downloads[job];
d->downloads.remove(job);
- KURL iconURL = static_cast<KIO::TransferJob *>(job)->url();
+ KURL iconURL = static_cast<TDEIO::TransferJob *>(job)->url();
TQString iconName;
if (!job->error())
{
@@ -254,9 +254,9 @@ void FaviconsModule::slotResult(KIO::Job *job)
emit iconChanged(download.isHost, download.hostOrURL, iconName);
}
-void FaviconsModule::slotInfoMessage(KIO::Job *job, const TQString &msg)
+void FaviconsModule::slotInfoMessage(TDEIO::Job *job, const TQString &msg)
{
- emit infoMessage(static_cast<KIO::TransferJob *>( job )->url(), msg);
+ emit infoMessage(static_cast<TDEIO::TransferJob *>( job )->url(), msg);
}
void FaviconsModule::slotKill()
diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h
index 1ca337713..72767f8de 100644
--- a/libkonq/favicons/favicons.h
+++ b/libkonq/favicons/favicons.h
@@ -22,7 +22,7 @@
#include <kdedmodule.h>
#include <kurl.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
* KDED Module to handle shortcut icons ("favicons")
@@ -91,9 +91,9 @@ private:
bool isIconOld(const TQString &);
private slots:
- void slotData(KIO::Job *, const TQByteArray &);
- void slotResult(KIO::Job *);
- void slotInfoMessage(KIO::Job *, const TQString &);
+ void slotData(TDEIO::Job *, const TQByteArray &);
+ void slotResult(TDEIO::Job *);
+ void slotInfoMessage(TDEIO::Job *, const TQString &);
void slotKill();
private:
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 8b7a9f53e..f962adafc 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -422,9 +422,9 @@ void KNewMenu::slotNewFile()
text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *it );
- defaultFile.addPath( KIO::encodeFileName( text ) );
+ defaultFile.addPath( TDEIO::encodeFileName( text ) );
if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) )
- text = KIO::RenameDlg::suggestName( *it, text);
+ text = TDEIO::RenameDlg::suggestName( *it, text);
KURL templateURL;
templateURL.setPath( entry.templatePath );
@@ -442,9 +442,9 @@ void KNewMenu::slotNewFile()
text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *(popupFiles.begin()) );
- defaultFile.addPath( KIO::encodeFileName( text ) );
+ defaultFile.addPath( TDEIO::encodeFileName( text ) );
if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) )
- text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
+ text = TDEIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
name = KInputDialog::getText( TQString::null, entry.comment,
text, &ok, d->m_parentWidget );
@@ -460,19 +460,19 @@ void KNewMenu::slotNewFile()
for ( ; it != popupFiles.end(); ++it )
{
KURL dest( *it );
- dest.addPath( KIO::encodeFileName(name) ); // Chosen destination file name
+ dest.addPath( TDEIO::encodeFileName(name) ); // Chosen destination file name
d->m_destPath = dest.path(); // will only be used if m_isURLDesktopFile and dest is local
KURL uSrc;
uSrc.setPath( src );
- //kdDebug(1203) << "KNewMenu : KIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
- KIO::CopyJob * job = KIO::copyAs( uSrc, dest );
+ //kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
+ TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest );
job->setDefaultPermissions( true );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotResult( TDEIO::Job * ) ) );
if ( m_isURLDesktopFile )
- connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL&, const KURL& ) ),
- TQT_SLOT( slotRenamed( KIO::Job *, const KURL&, const KURL& ) ) );
+ connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
+ TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
KURL::List lst;
lst.append( uSrc );
(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -481,7 +481,7 @@ void KNewMenu::slotNewFile()
// Special case (filename conflict when creating a link=url file)
// We need to update m_destURL
-void KNewMenu::slotRenamed( KIO::Job *, const KURL& from , const KURL& to )
+void KNewMenu::slotRenamed( TDEIO::Job *, const KURL& from , const KURL& to )
{
if ( from.isLocalFile() )
{
@@ -491,13 +491,13 @@ void KNewMenu::slotRenamed( KIO::Job *, const KURL& from , const KURL& to )
}
}
-void KNewMenu::slotResult( KIO::Job * job )
+void KNewMenu::slotResult( TDEIO::Job * job )
{
if (job->error())
job->showErrorDialog();
else
{
- KURL destURL = static_cast<KIO::CopyJob*>(job)->destURL();
+ KURL destURL = static_cast<TDEIO::CopyJob*>(job)->destURL();
if ( destURL.isLocalFile() )
{
if ( m_isURLDesktopFile )
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index 6935ae7a4..9e2181329 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -28,7 +28,7 @@
#include <kurl.h>
#include <libkonq_export.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KDirWatch;
class KLineEdit;
@@ -96,9 +96,9 @@ protected slots:
*/
void slotFillTemplates();
- void slotResult( KIO::Job * );
+ void slotResult( TDEIO::Job * );
// Special case (filename conflict when creating a link=url file)
- void slotRenamed( KIO::Job *, const KURL&, const KURL& );
+ void slotRenamed( TDEIO::Job *, const KURL&, const KURL& );
private:
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 472ea1dbb..86f945742 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -430,7 +430,7 @@ void KonqDirPart::slotClipboardDataChanged()
void KonqDirPart::updatePasteAction() // KDE4: merge into method above
{
- TQString actionText = KIO::pasteActionText();
+ TQString actionText = TDEIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste )
emit m_extension->setActionText( "paste", actionText );
@@ -476,7 +476,7 @@ void KonqDirPart::emitTotalCount()
}
TQString summary =
- KIO::itemsSummaryString(m_lFileCount + m_lDirCount,
+ TDEIO::itemsSummaryString(m_lFileCount + m_lDirCount,
m_lFileCount,
m_lDirCount,
m_lDirSize,
@@ -513,7 +513,7 @@ void KonqDirPart::emitCounts( const KFileItemList & lst )
}
}
- emit setStatusBarText( KIO::itemsSummaryString( fileCount + dirCount,
+ emit setStatusBarText( TDEIO::itemsSummaryString( fileCount + dirCount,
fileCount, dirCount,
fileSizeSum, true ) );
}
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index 90ae1f65e..9c5d0735e 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -312,7 +312,7 @@ protected:
// Remove all those in KDE4
int m_iIconSize[5];
- KIO::filesize_t m_lDirSize;
+ TDEIO::filesize_t m_lDirSize;
uint m_lFileCount;
uint m_lDirCount;
diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h
index cade20d63..c047d904e 100644
--- a/libkonq/konq_events.h
+++ b/libkonq/konq_events.h
@@ -10,7 +10,7 @@ namespace KParts
class ReadOnlyPart;
}
-class KConfig;
+class TDEConfig;
class KFileItem;
typedef TQPtrList<KFileItem> KFileItemList;
@@ -51,9 +51,9 @@ private:
class LIBKONQ_EXPORT KonqConfigEvent : public KParts::Event
{
public:
- KonqConfigEvent( KConfig *config, const TQString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {}
+ KonqConfigEvent( TDEConfig *config, const TQString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {}
- KConfig * config() const { return m_config; }
+ TDEConfig * config() const { return m_config; }
TQString prefix() const { return m_prefix; }
bool save() const { return m_save; }
@@ -62,7 +62,7 @@ public:
private:
static const char *s_configEventName;
- KConfig *m_config;
+ TDEConfig *m_config;
TQString m_prefix;
bool m_save;
};
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index fe1092f4c..c576a043a 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -260,10 +260,10 @@ void KonqFileTip::startDelayed()
KFileItemList oneItem;
oneItem.append( m_item );
- m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
+ m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
- connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( gotPreviewResult() ) );
}
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index 2c30a0a8f..93c82780b 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -89,7 +89,7 @@ class LIBKONQ_EXPORT KonqFileTip : public TQFrame
int m_num;
TQScrollView* m_view;
KFileItem* m_item;
- KIO::PreviewJob* m_previewJob;
+ TDEIO::PreviewJob* m_previewJob;
TQRect m_rect;
TQTimer* m_timer;
};
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index 6d5f314b7..c9367130d 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -40,8 +40,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_updateTimer = new TQTimer( this );
// defaults
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, "HistorySettings" );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, "HistorySettings" );
m_maxCount = config->readNumEntry( "Maximum of History entries", 500 );
m_maxCount = TQMAX( 1, m_maxCount );
m_maxAgeDays = config->readNumEntry( "Maximum age of History entries", 90);
@@ -493,8 +493,8 @@ void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString )
clearPending();
adjustSize();
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, "HistorySettings" );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum of History entries", m_maxCount );
if ( isSenderOfBroadcast() ) {
@@ -509,8 +509,8 @@ void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString )
clearPending();
adjustSize();
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, "HistorySettings" );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum age of History entries", m_maxAgeDays );
if ( isSenderOfBroadcast() ) {
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 4be11a989..b82610d33 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -101,7 +101,7 @@ struct KonqIconViewWidgetPrivate
int m_movieBlocked;
TQString movieFileName;
- KIO::PreviewJob *pPreviewJob;
+ TDEIO::PreviewJob *pPreviewJob;
KonqFileTip* pFileTip;
TQStringList previewSettings;
bool renameItem;
@@ -206,7 +206,7 @@ void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &n
// Actually attempt the rename. If it succeeds, KDirLister will update the name.
KURL oldurl( fileItem->url() );
KURL newurl( oldurl );
- newurl.setPath( newurl.directory(false) + KIO::encodeFileName( name ) );
+ newurl.setPath( newurl.directory(false) + TDEIO::encodeFileName( name ) );
kdDebug(1203)<<" newurl :"<<newurl<<endl;
// We use url()+name so that it also works if the name is a relative path (#51176)
KonqOperations::rename( this, oldurl, newurl );
@@ -227,7 +227,7 @@ void KonqIconViewWidget::slotIconChanged( int group )
void KonqIconViewWidget::readAnimatedIconsConfig()
{
- KConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" );
+ TDEConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" );
d->doAnimations = cfgGroup.readBoolEntry( "Animated", true /*default*/ );
}
@@ -607,7 +607,7 @@ bool KonqIconViewWidget::boostPreview() const
{
if ( m_bDesktop ) return false;
- KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
+ TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
return group.readBoolEntry( "BoostSize", false );
}
@@ -684,7 +684,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQStringList& mimeList ) const
{
- // Code duplication from KIO::PreviewJob
+ // Code duplication from TDEIO::PreviewJob
KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
for (TQStringList::ConstIterator mt = mimeList.begin(); mt != mimeList.end(); ++mt)
{
@@ -867,12 +867,12 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
if ( !d->bBoostPreview )
iconSize /= 2;
- d->pPreviewJob = KIO::filePreview( items, size, size, iconSize,
+ d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize,
m_pSettings->textPreviewIconTransparency(), true /* scale */,
true /* save */, &(d->previewSettings) );
connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
- connect( d->pPreviewJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotPreviewResult() ) );
}
@@ -916,7 +916,7 @@ void KonqIconViewWidget::slotDropped( TQDropEvent *ev, const TQValueList<TQIconD
KonqOperations::doDrop( m_rootItem /* may be 0L */, dirURL, ev, this );
}
-void KonqIconViewWidget::slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)
+void KonqIconViewWidget::slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)
{
// Do nothing :-)
}
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 85d743782..2625055d8 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -31,7 +31,7 @@
class KonqFMSettings;
class KFileIVI;
class KonqIconDrag;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
/**
* A file-aware icon view, implementing drag'n'drop, KDE icon sizes,
@@ -299,7 +299,7 @@ protected slots:
void slotMovieStatus( int status );
void slotReenableAnimation();
- void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
+ void slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files);
void doubleClickTimeout();
protected:
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 1f81c1027..40a30aa10 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -109,7 +109,7 @@ void KonqOperations::restoreTrashedItems( const KURL::List& urls )
void KonqOperations::mkdir( TQWidget *parent, const KURL & url )
{
- KIO::Job * job = KIO::mkdir( url );
+ TDEIO::Job * job = TDEIO::mkdir( url );
KonqOperations * op = new KonqOperations( parent );
op->setOperation( job, MKDIR, KURL::List(), url );
(void) new KonqCommandRecorder( KonqCommand::MKDIR, KURL(), url, job ); // no support yet, apparently
@@ -130,11 +130,11 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP
kdDebug(1203) << "move (from clipboard data) = " << move << endl;
}
- KIO::Job *job = KIO::pasteClipboard( destURL, move );
+ TDEIO::Job *job = TDEIO::pasteClipboard( destURL, move );
if ( job )
{
KonqOperations * op = new KonqOperations( parent );
- KIO::CopyJob * copyJob = static_cast<KIO::CopyJob *>(job);
+ TDEIO::CopyJob * copyJob = static_cast<TDEIO::CopyJob *>(job);
KIOPasteInfo * pi = new KIOPasteInfo;
pi->mousePos = pos;
op->setPasteInfo( pi );
@@ -158,13 +158,13 @@ void KonqOperations::copy( TQWidget * parent, int method, const KURL::List & sel
}
KonqOperations * op = new KonqOperations( parent );
- KIO::Job* job(0);
+ TDEIO::Job* job(0);
if (method==LINK)
- job= KIO::link( selectedURLs, destUrl);
+ job= TDEIO::link( selectedURLs, destUrl);
else if (method==MOVE)
- job= KIO::move( selectedURLs, destUrl);
+ job= TDEIO::move( selectedURLs, destUrl);
else
- job= KIO::copy( selectedURLs, destUrl);
+ job= TDEIO::copy( selectedURLs, destUrl);
op->setOperation( job, method, selectedURLs, destUrl );
@@ -188,13 +188,13 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) )
{
//m_srcURLs = selectedURLs;
- KIO::Job *job;
+ TDEIO::Job *job;
m_method = method;
switch( method )
{
case TRASH:
{
- job = KIO::trash( selectedURLs );
+ job = TDEIO::trash( selectedURLs );
(void) new KonqCommandRecorder( KonqCommand::TRASH, selectedURLs, "trash:/", job );
break;
}
@@ -204,23 +204,23 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)1;
- job = KIO::special( "trash:/", packedArgs );
+ job = TDEIO::special( "trash:/", packedArgs );
KNotifyClient::event(0, "Trash: emptied");
break;
}
case DEL:
- job = KIO::del( selectedURLs );
+ job = TDEIO::del( selectedURLs );
break;
case SHRED:
- job = KIO::del( selectedURLs, true );
+ job = TDEIO::del( selectedURLs, true );
break;
default:
kdWarning() << "Unknown operation: " << method << endl;
delete this;
return;
}
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotResult( TDEIO::Job * ) ) );
} else
delete this;
}
@@ -229,8 +229,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls )
{
m_method = RESTORE;
KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget )
@@ -241,7 +241,7 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
bool ask = ( confirmation == FORCE_CONFIRMATION );
if ( !ask )
{
- KConfig config("konquerorrc", true, false);
+ TDEConfig config("konquerorrc", true, false);
config.setGroup( "Trash" );
keyName = ( method == DEL ? "ConfirmDelete" : method == SHRED ? "ConfirmShred" : "ConfirmTrash" );
bool defaultValue = ( method == DEL ? DEFAULT_CONFIRMDELETE : method == SHRED ? DEFAULT_CONFIRMSHRED : DEFAULT_CONFIRMTRASH );
@@ -294,13 +294,13 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
if (!keyName.isEmpty())
{
// Check kmessagebox setting... erase & copy to konquerorrc.
- KConfig *config = kapp->config();
- KConfigGroupSaver saver(config, "Notification Messages");
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver saver(config, "Notification Messages");
if (!config->readBoolEntry(keyName, true))
{
config->writeEntry(keyName, true);
config->sync();
- KConfig konq_config("konquerorrc", false);
+ TDEConfig konq_config("konquerorrc", false);
konq_config.setGroup( "Trash" );
konq_config.writeEntry( keyName, false );
}
@@ -384,7 +384,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr
{
//kdDebug(1203) << "Pasting to " << dest.url() << endl;
KonqOperations * op = new KonqOperations(parent);
- KIO::CopyJob* job = KIO::pasteMimeSource( ev, dest,
+ TDEIO::CopyJob* job = TDEIO::pasteMimeSource( ev, dest,
i18n( "File name for dropped contents:" ),
parent );
if ( job ) // 0 if canceled by user
@@ -447,7 +447,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
TQString point = desktopFile.readEntry( "MountPoint" );
m_destURL.setPath( point );
TQString dev = desktopFile.readDevice();
- TQString mp = KIO::findDeviceMountPoint( dev );
+ TQString mp = TDEIO::findDeviceMountPoint( dev );
// Is the device already mounted ?
if ( !mp.isNull() )
doFileCopy();
@@ -597,10 +597,10 @@ void KonqOperations::doFileCopy()
}
}
- KIO::Job * job = 0;
+ TDEIO::Job * job = 0;
switch ( action ) {
case TQDropEvent::Move :
- job = KIO::move( lst, m_destURL );
+ job = TDEIO::move( lst, m_destURL );
job->setMetaData( m_info->metaData );
setOperation( job, m_method == TRASH ? TRASH : MOVE, lst, m_destURL );
(void) new KonqCommandRecorder(
@@ -608,14 +608,14 @@ void KonqOperations::doFileCopy()
lst, m_destURL, job );
return; // we still have stuff to do -> don't delete ourselves
case TQDropEvent::Copy :
- job = KIO::copy( lst, m_destURL );
+ job = TDEIO::copy( lst, m_destURL );
job->setMetaData( m_info->metaData );
setOperation( job, COPY, lst, m_destURL );
(void) new KonqCommandRecorder( KonqCommand::COPY, lst, m_destURL, job );
return;
case TQDropEvent::Link :
kdDebug(1203) << "KonqOperations::asyncDrop lst.count=" << lst.count() << endl;
- job = KIO::link( lst, m_destURL );
+ job = TDEIO::link( lst, m_destURL );
job->setMetaData( m_info->metaData );
setOperation( job, LINK, lst, m_destURL );
(void) new KonqCommandRecorder( KonqCommand::LINK, lst, m_destURL, job );
@@ -633,7 +633,7 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
KURL::List lst;
lst.append(oldurl);
- KIO::Job * job = KIO::moveAs( oldurl, newurl, !oldurl.isLocalFile() );
+ TDEIO::Job * job = TDEIO::moveAs( oldurl, newurl, !oldurl.isLocalFile() );
KonqOperations * op = new KonqOperations( parent );
op->setOperation( job, MOVE, lst, newurl );
(void) new KonqCommandRecorder( KonqCommand::MOVE, lst, newurl, job );
@@ -641,38 +641,38 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
if ( oldurl.isLocalFile() && oldurl.path(1) == TDEGlobalSettings::desktopPath() )
{
kdDebug(1203) << "That rename was the Desktop path, updating config files" << endl;
- KConfig *globalConfig = TDEGlobal::config();
- KConfigGroupSaver cgs( globalConfig, "Paths" );
+ TDEConfig *globalConfig = TDEGlobal::config();
+ TDEConfigGroupSaver cgs( globalConfig, "Paths" );
globalConfig->writePathEntry("Desktop" , newurl.path(), true, true );
globalConfig->sync();
KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS);
}
}
-void KonqOperations::setOperation( KIO::Job * job, int method, const KURL::List & /*src*/, const KURL & dest )
+void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::List & /*src*/, const KURL & dest )
{
m_method = method;
//m_srcURLs = src;
m_destURL = dest;
if ( job )
{
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::CopyJob *copyJob = tqt_dynamic_cast<KIO::CopyJob*>(job);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::CopyJob *copyJob = tqt_dynamic_cast<TDEIO::CopyJob*>(job);
KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
if (copyJob && iconView)
{
- connect(copyJob, TQT_SIGNAL(aboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)),
- this, TQT_SLOT(slotAboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)));
- connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)),
- iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)));
+ connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
+ this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
+ connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
+ iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
}
}
else // for link
slotResult( 0L );
}
-void KonqOperations::slotAboutToCreate(KIO::Job *, const TQValueList<KIO::CopyInfo> &files)
+void KonqOperations::slotAboutToCreate(TDEIO::Job *, const TQValueList<TDEIO::CopyInfo> &files)
{
emit aboutToCreate( m_info ? m_info->mousePos : m_pasteInfo ? m_pasteInfo->mousePos : TQPoint(), files);
}
@@ -687,18 +687,18 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const
void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member )
{
connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
- KIO::StatJob * job = KIO::stat( url /*, false?*/ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+ TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
}
-void KonqOperations::slotStatResult( KIO::Job * job )
+void KonqOperations::slotStatResult( TDEIO::Job * job )
{
if ( job->error())
job->showErrorDialog( (TQWidget*)parent() );
else
{
- KIO::StatJob * statJob = static_cast<KIO::StatJob*>(job);
+ TDEIO::StatJob * statJob = static_cast<TDEIO::StatJob*>(job);
KFileItem * item = new KFileItem( statJob->statResult(), statJob->url() );
emit statFinished( item );
delete item;
@@ -708,7 +708,7 @@ void KonqOperations::slotStatResult( KIO::Job * job )
delete this;
}
-void KonqOperations::slotResult( KIO::Job * job )
+void KonqOperations::slotResult( TDEIO::Job * job )
{
if (job && job->error())
job->showErrorDialog( (TQWidget*)parent() );
@@ -733,7 +733,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL )
bool ok;
TQString name = i18n( "New Folder" );
if ( baseURL.isLocalFile() && TQFileInfo( baseURL.path(+1) + name ).exists() )
- name = KIO::RenameDlg::suggestName( baseURL, i18n( "New Folder" ) );
+ name = TDEIO::RenameDlg::suggestName( baseURL, i18n( "New Folder" ) );
name = KInputDialog::getText ( i18n( "New Folder" ),
i18n( "Enter folder name:" ), name, &ok, parent );
@@ -746,7 +746,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL )
}
else
{
- name = KIO::encodeFileName( name );
+ name = TDEIO::encodeFileName( name );
url = baseURL;
url.addPath( name );
}
@@ -757,7 +757,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL )
////
KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgressInfo )
- : KIO::Job( showProgressInfo ),
+ : TDEIO::Job( showProgressInfo ),
m_urls( urls ), m_urlsIterator( m_urls.begin() ),
m_progress( 0 )
{
@@ -788,7 +788,7 @@ void KonqMultiRestoreJob::slotStart()
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)3 << new_url;
- KIO::Job* job = KIO::special( new_url, packedArgs );
+ TDEIO::Job* job = TDEIO::special( new_url, packedArgs );
addSubjob( job );
}
else // done!
@@ -799,11 +799,11 @@ void KonqMultiRestoreJob::slotStart()
}
}
-void KonqMultiRestoreJob::slotResult( KIO::Job *job )
+void KonqMultiRestoreJob::slotResult( TDEIO::Job *job )
{
if ( job->error() )
{
- KIO::Job::slotResult( job ); // will set the error and emit result(this)
+ TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
return;
}
subjobs.remove( job );
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index 66e04ee0d..1ffd14690 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <tqevent.h>
-namespace KIO { class Job; class CopyInfo; }
+namespace TDEIO { class Job; class CopyInfo; }
class TQWidget;
class KFileItem;
class KonqMainWindow;
@@ -139,7 +139,7 @@ public:
signals:
void statFinished( const KFileItem * item );
- void aboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
+ void aboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files);
protected:
void _del( int method, const KURL::List & selectedURLs, ConfirmationType confirmation );
@@ -147,7 +147,7 @@ protected:
void _statURL( const KURL & url, const TQObject *receiver, const char *member );
// internal, for COPY/MOVE/LINK/MKDIR
- void setOperation( KIO::Job * job, int method, const KURL::List & src, const KURL & dest );
+ void setOperation( TDEIO::Job * job, int method, const KURL::List & src, const KURL & dest );
struct DropInfo
{
@@ -177,9 +177,9 @@ private:
protected slots:
- void slotAboutToCreate(KIO::Job *job, const TQValueList<KIO::CopyInfo> &files);
- void slotResult( KIO::Job * job );
- void slotStatResult( KIO::Job * job );
+ void slotAboutToCreate(TDEIO::Job *job, const TQValueList<TDEIO::CopyInfo> &files);
+ void slotResult( TDEIO::Job * job );
+ void slotStatResult( TDEIO::Job * job );
void asyncDrop( const KFileItem * item );
void doFileCopy();
@@ -195,7 +195,7 @@ private:
#include <kio/job.h>
/// Restore multiple trashed files
-class KonqMultiRestoreJob : public KIO::Job
+class KonqMultiRestoreJob : public TDEIO::Job
{
Q_OBJECT
@@ -204,7 +204,7 @@ public:
protected slots:
virtual void slotStart();
- virtual void slotResult( KIO::Job *job );
+ virtual void slotResult( TDEIO::Job *job );
private:
const KURL::List m_urls;
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index 291857887..72f24b8c6 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -93,7 +93,7 @@ TQPixmap KonqPixmapProvider::pixmapFor( const TQString& url, int size )
return loadIcon( url, iconNameFor( url ), size );
}
-void KonqPixmapProvider::load( KConfig *kc, const TQString& key )
+void KonqPixmapProvider::load( TDEConfig *kc, const TQString& key )
{
iconMap.clear();
TQStringList list;
@@ -113,7 +113,7 @@ void KonqPixmapProvider::load( KConfig *kc, const TQString& key )
// only saves the cache for the given list of items to prevent the cache
// from growing forever.
-void KonqPixmapProvider::save( KConfig *kc, const TQString& key,
+void KonqPixmapProvider::save( TDEConfig *kc, const TQString& key,
const TQStringList& items )
{
TQStringList list;
diff --git a/libkonq/konq_pixmapprovider.h b/libkonq/konq_pixmapprovider.h
index cb20879a6..ca259915f 100644
--- a/libkonq/konq_pixmapprovider.h
+++ b/libkonq/konq_pixmapprovider.h
@@ -27,7 +27,7 @@
#include <libkonq_export.h>
-class KConfig;
+class TDEConfig;
class LIBKONQ_EXPORT KonqPixmapProvider : public KonqFavIconMgr, virtual public KPixmapProvider
{
@@ -42,14 +42,14 @@ public:
virtual TQPixmap pixmapFor( const TQString& url, int size = 0 );
/**
- * Loads the cache to @p kc from the current KConfig-group from key @p key.
+ * Loads the cache to @p kc from the current TDEConfig-group from key @p key.
*/
- void load( KConfig * kc, const TQString& key );
+ void load( TDEConfig * kc, const TQString& key );
/**
- * Saves the cache to @p kc into the current KConfig-group as key @p key.
+ * Saves the cache to @p kc into the current TDEConfig-group as key @p key.
* Only those @p items are saved, otherwise the cache would grow forever.
*/
- void save( KConfig *, const TQString& key, const TQStringList& items );
+ void save( TDEConfig *, const TQString& key, const TQStringList& items );
/**
* Clears the pixmap cache
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 9e2f0bf53..8d2503c30 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -306,7 +306,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
return count;
}
-bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg)
+bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg)
{
if ( !cfg.hasKey( "X-TDE-AuthorizeAction") )
{
@@ -423,9 +423,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// If a local path is available, monitor that instead of the given remote URL...
KURL realURL = m_sViewURL;
if (!realURL.isLocalFile()) {
- KIO::LocalURLJob* localURLJob = KIO::localURL(m_sViewURL);
+ TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL);
if (localURLJob) {
- connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool)));
+ connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool)));
connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
d->localURLSlotFired = false;
while (!d->localURLSlotFired) {
@@ -593,7 +593,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addDel = true;
}
else {
- KConfigGroup configGroup( kapp->config(), "KDE" );
+ TDEConfigGroup configGroup( kapp->config(), "KDE" );
if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
addDel = true;
}
@@ -1226,7 +1226,7 @@ KURL::List KonqPopupMenu::popupURLList() const
return m_lstPopupURLs;
}
-void KonqPopupMenu::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal)
+void KonqPopupMenu::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal)
{
d->localURLSlotFired = true;
d->localURLResultURL = url;
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index a190ae98f..744d67c4d 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -178,7 +178,7 @@ protected:
KActionCollection m_ownActions;
private slots:
- void slotLocalURL( KIO::Job *, const KURL&, bool );
+ void slotLocalURL( TDEIO::Job *, const KURL&, bool );
void slotLocalURLKIODestroyed( );
private:
@@ -187,7 +187,7 @@ private:
void addPlugins( );
int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);
int insertServices(const ServiceList& list, TQDomElement& menu, bool isBuiltin);
- bool KIOSKAuthorizedAction(KConfig& cfg);
+ bool KIOSKAuthorizedAction(TDEConfig& cfg);
KPropertiesDialog* showPropertiesDialog();
class KonqPopupMenuPrivate;
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index 84d6fa5c5..8a179672e 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -80,8 +80,8 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
m_defaultProps( defaultProps )
{
- KConfig *config = instance->config();
- KConfigGroupSaver cgs(config, "Settings");
+ TDEConfig *config = instance->config();
+ TDEConfigGroupSaver cgs(config, "Settings");
d = new Private;
d->previewsToShow = 0;
@@ -121,7 +121,7 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
// So now we read the settings from the app global file, if this is the default props
if (!defaultProps)
{
- KConfigGroupSaver cgs2(TDEGlobal::config(), "Settings");
+ TDEConfigGroupSaver cgs2(TDEGlobal::config(), "Settings");
m_textColor = TDEGlobal::config()->readColorEntry( "TextColor", &m_textColor );
m_bgColor = TDEGlobal::config()->readColorEntry( "BgColor", &m_bgColor );
m_bgPixmapFile = TDEGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile );
@@ -147,7 +147,7 @@ bool KonqPropsView::isDescending() const
return d->descending;
}
-KConfigBase * KonqPropsView::currentConfig()
+TDEConfigBase * KonqPropsView::currentConfig()
{
if ( !m_currentConfig )
{
@@ -162,7 +162,7 @@ KConfigBase * KonqPropsView::currentConfig()
return m_currentConfig;
}
-KConfigBase * KonqPropsView::currentColorConfig()
+TDEConfigBase * KonqPropsView::currentColorConfig()
{
// Saving locally ?
if ( m_bSaveViewPropertiesLocally && !isDefaultProperties() )
@@ -281,7 +281,7 @@ void KonqPropsView::setIconSize( int size )
m_defaultProps->setIconSize( size );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "IconSize", m_iIconSize );
currentConfig()->sync();
}
@@ -294,7 +294,7 @@ void KonqPropsView::setItemTextPos( int pos )
m_defaultProps->setItemTextPos( pos );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "ItemTextPos", m_iItemTextPos );
currentConfig()->sync();
}
@@ -307,7 +307,7 @@ void KonqPropsView::setSortCriterion( const TQString &criterion )
m_defaultProps->setSortCriterion( criterion );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "SortingCriterion", d->sortcriterion );
currentConfig()->sync();
}
@@ -320,7 +320,7 @@ void KonqPropsView::setDirsFirst( bool first)
m_defaultProps->setDirsFirst( first );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "SortDirsFirst", d->dirsfirst );
currentConfig()->sync();
}
@@ -333,7 +333,7 @@ void KonqPropsView::setDescending( bool descend)
m_defaultProps->setDescending( descend );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "SortDescending", d->descending );
currentConfig()->sync();
}
@@ -351,7 +351,7 @@ void KonqPropsView::setShowingDotFiles( bool show )
else if (currentConfig())
{
kdDebug(1203) << "Saving in current config" << endl;
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "ShowDotFiles", m_bShowDot );
currentConfig()->sync();
}
@@ -369,7 +369,7 @@ void KonqPropsView::setCaseInsensitiveSort( bool on )
else if (currentConfig())
{
kdDebug(1203) << "Saving in current config" << endl;
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "CaseInsensitiveSort", d->caseInsensitiveSort );
currentConfig()->sync();
}
@@ -387,7 +387,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show )
else if (currentConfig())
{
kdDebug(1203) << "Saving in current config" << endl;
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "ShowDirectoryOverlays", m_bShowDirectoryOverlays );
currentConfig()->sync();
}
@@ -405,7 +405,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
m_defaultProps->setShowingPreview( preview, show );
else if (currentConfig())
{
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
//Audio is special-cased, as we use a binary setting
//for it to get it to follow the defaults right.
@@ -438,7 +438,7 @@ void KonqPropsView::setShowingPreview( bool show )
else if (currentConfig())
{
kdDebug(1203) << "Saving in current config" << endl;
- KConfigGroupSaver cgs(currentConfig(), currentGroup());
+ TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
currentConfig()->writeEntry( "PreviewsEnabled", d->previewsEnabled );
currentConfig()->sync();
}
@@ -461,10 +461,10 @@ void KonqPropsView::setBgColor( const TQColor & color )
}
else
{
- KConfigBase * colorConfig = currentColorConfig();
+ TDEConfigBase * colorConfig = currentColorConfig();
if (colorConfig) // 0L when saving locally but remote URL
{
- KConfigGroupSaver cgs(colorConfig, currentGroup());
+ TDEConfigGroupSaver cgs(colorConfig, currentGroup());
colorConfig->writeEntry( "BgColor", m_bgColor );
colorConfig->sync();
}
@@ -488,10 +488,10 @@ void KonqPropsView::setTextColor( const TQColor & color )
}
else
{
- KConfigBase * colorConfig = currentColorConfig();
+ TDEConfigBase * colorConfig = currentColorConfig();
if (colorConfig) // 0L when saving locally but remote URL
{
- KConfigGroupSaver cgs(colorConfig, currentGroup());
+ TDEConfigGroupSaver cgs(colorConfig, currentGroup());
colorConfig->writeEntry( "TextColor", m_textColor );
colorConfig->sync();
}
@@ -516,10 +516,10 @@ void KonqPropsView::setBgPixmapFile( const TQString & file )
}
else
{
- KConfigBase * colorConfig = currentColorConfig();
+ TDEConfigBase * colorConfig = currentColorConfig();
if (colorConfig) // 0L when saving locally but remote URL
{
- KConfigGroupSaver cgs(colorConfig, currentGroup());
+ TDEConfigGroupSaver cgs(colorConfig, currentGroup());
colorConfig->writePathEntry( "BgImage", file );
colorConfig->sync();
}
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index 4edfe8246..fb0383072 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -27,8 +27,8 @@
#include <libkonq_export.h>
class TDEInstance;
-class KConfigBase;
-class KConfig;
+class TDEConfigBase;
+class TDEConfig;
/**
* The class KonqPropsView holds the properties for a Konqueror View
@@ -126,10 +126,10 @@ protected:
TQPixmap loadPixmap() const;
// Current config object for _saving_
- KConfigBase * currentConfig();
+ TDEConfigBase * currentConfig();
// Current config object for _saving_ settings related to colors
- KConfigBase * currentColorConfig();
+ TDEConfigBase * currentColorConfig();
TQString currentGroup() const {
return isDefaultProperties() ?
@@ -160,8 +160,8 @@ private:
// save-view-properties-locally mode, otherwise to the global config
// It is set to 0L to mark it as "needs to be constructed".
// This is to be used for SAVING only.
- // Can be a KConfig or a KSimpleConfig
- KConfigBase * m_currentConfig;
+ // Can be a TDEConfig or a KSimpleConfig
+ TDEConfigBase * m_currentConfig;
// If this is not a "default properties" instance (but one used by a view)
// then m_defaultProps points to the "default properties" instance
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index 3d67c6798..aef17475b 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -48,8 +48,8 @@ KonqFMSettings * KonqFMSettings::settings()
{
if (!s_pSettings)
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cgs(config, "FMSettings");
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cgs(config, "FMSettings");
s_pSettings = new KonqFMSettings(config);
}
return s_pSettings;
@@ -60,13 +60,13 @@ void KonqFMSettings::reparseConfiguration()
{
if (s_pSettings)
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cgs(config, "FMSettings");
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cgs(config, "FMSettings");
s_pSettings->init( config );
}
}
-KonqFMSettings::KonqFMSettings( KConfig * config )
+KonqFMSettings::KonqFMSettings( TDEConfig * config )
{
d = new KonqFMSettingsPrivate;
init( config );
@@ -77,7 +77,7 @@ KonqFMSettings::~KonqFMSettings()
delete d;
}
-void KonqFMSettings::init( KConfig * config )
+void KonqFMSettings::init( TDEConfig * config )
{
// Fonts and colors
m_standardFont = config->readFontEntry( "StandardFont" );
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h
index b81457e02..daca8babe 100644
--- a/libkonq/konq_settings.h
+++ b/libkonq/konq_settings.h
@@ -20,7 +20,7 @@
#ifndef __konq_settings_h__
#define __konq_settings_h__
-class KConfig;
+class TDEConfig;
#include <tqcolor.h>
#include <tqstring.h>
#include <tqfont.h>
@@ -48,7 +48,7 @@ protected:
* @internal
* Constructs a KonqFMSettings instance from a config file.
*/
- KonqFMSettings( KConfig * config );
+ KonqFMSettings( TDEConfig * config );
/** Destructor. Don't delete any instance by yourself. */
virtual ~KonqFMSettings();
@@ -128,7 +128,7 @@ private:
int m_iconTransparency;
/** Called by constructor and reparseConfiguration */
- void init( KConfig * config );
+ void init( TDEConfig * config );
struct KonqFMSettingsPrivate * d;
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 6c170050a..4c3599816 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -63,13 +63,13 @@ inline const char *dcopTypeName( const KonqCommand::Stack & ) { return "KonqComm
* move files -> rename -> works
*/
-class KonqUndoJob : public KIO::Job
+class KonqUndoJob : public TDEIO::Job
{
public:
- KonqUndoJob() : KIO::Job( true ) { KonqUndoManager::incRef(); };
+ KonqUndoJob() : TDEIO::Job( true ) { KonqUndoManager::incRef(); };
virtual ~KonqUndoJob() { KonqUndoManager::decRef(); }
- virtual void kill( bool q) { KonqUndoManager::self()->stopUndo( true ); KIO::Job::kill( q ); }
+ virtual void kill( bool q) { KonqUndoManager::self()->stopUndo( true ); TDEIO::Job::kill( q ); }
};
class KonqCommandRecorder::KonqCommandRecorderPrivate
@@ -85,7 +85,7 @@ public:
KonqCommand m_cmd;
};
-KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, KIO::Job *job )
+KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job )
: TQObject( job, "konqcmdrecorder" )
{
d = new KonqCommandRecorderPrivate;
@@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List
d->m_cmd.m_valid = true;
d->m_cmd.m_src = src;
d->m_cmd.m_dst = dst;
- 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 * ) ) );
if ( op != KonqCommand::MKDIR ) {
- connect( job, TQT_SIGNAL( copyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ),
- this, TQT_SLOT( slotCopyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
- connect( job, TQT_SIGNAL( copyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ),
- this, TQT_SLOT( slotCopyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
+ connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
+ this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
+ connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
+ this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
}
KonqUndoManager::incRef();
@@ -112,7 +112,7 @@ KonqCommandRecorder::~KonqCommandRecorder()
delete d;
}
-void KonqCommandRecorder::slotResult( KIO::Job *job )
+void KonqCommandRecorder::slotResult( TDEIO::Job *job )
{
if ( job->error() )
return;
@@ -120,7 +120,7 @@ void KonqCommandRecorder::slotResult( KIO::Job *job )
KonqUndoManager::self()->addCommand( d->m_cmd );
}
-void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
+void KonqCommandRecorder::slotCopyingDone( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed )
{
KonqBasicOperation op;
op.m_valid = true;
@@ -145,7 +145,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons
d->m_cmd.m_opStack.prepend( op );
}
-void KonqCommandRecorder::slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to )
+void KonqCommandRecorder::slotCopyingLinkDone( TDEIO::Job *, const KURL &from, const TQString &target, const KURL &to )
{
KonqBasicOperation op;
op.m_valid = true;
@@ -179,7 +179,7 @@ public:
KonqCommand::Stack m_commands;
KonqCommand m_current;
- KIO::Job *m_currentJob;
+ TDEIO::Job *m_currentJob;
UndoState m_undoState;
TQValueStack<KURL> m_dirStack;
TQValueStack<KURL> m_dirCleanupStack;
@@ -369,7 +369,7 @@ void KonqUndoManager::stopUndo( bool step )
undoStep();
}
-void KonqUndoManager::slotResult( KIO::Job *job )
+void KonqUndoManager::slotResult( TDEIO::Job *job )
{
d->m_uiserver->jobFinished( d->m_uiserverJobId );
if ( job->error() )
@@ -411,8 +411,8 @@ void KonqUndoManager::undoStep()
undoRemovingDirectories();
if ( d->m_currentJob )
- connect( d->m_currentJob, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
void KonqUndoManager::undoMakingDirectories()
@@ -420,7 +420,7 @@ void KonqUndoManager::undoMakingDirectories()
if ( !d->m_dirStack.isEmpty() ) {
KURL dir = d->m_dirStack.pop();
kdDebug(1203) << "KonqUndoManager::undoStep creatingDir " << dir.prettyURL() << endl;
- d->m_currentJob = KIO::mkdir( dir );
+ d->m_currentJob = TDEIO::mkdir( dir );
d->m_uiserver->creatingDir( d->m_uiserverJobId, dir );
}
else
@@ -439,7 +439,7 @@ void KonqUndoManager::undoMovingFiles()
if ( op.m_renamed )
{
kdDebug(1203) << "KonqUndoManager::undoStep rename " << op.m_dst.prettyURL() << " " << op.m_src.prettyURL() << endl;
- d->m_currentJob = KIO::rename( op.m_dst, op.m_src, false );
+ d->m_currentJob = TDEIO::rename( op.m_dst, op.m_src, false );
d->m_uiserver->moving( d->m_uiserverJobId, op.m_dst, op.m_src );
}
else
@@ -448,19 +448,19 @@ void KonqUndoManager::undoMovingFiles()
else if ( op.m_link )
{
kdDebug(1203) << "KonqUndoManager::undoStep symlink " << op.m_target << " " << op.m_src.prettyURL() << endl;
- d->m_currentJob = KIO::symlink( op.m_target, op.m_src, true, false );
+ d->m_currentJob = TDEIO::symlink( op.m_target, op.m_src, true, false );
}
else if ( d->m_current.m_type == KonqCommand::COPY )
{
kdDebug(1203) << "KonqUndoManager::undoStep file_delete " << op.m_dst.prettyURL() << endl;
- d->m_currentJob = KIO::file_delete( op.m_dst );
+ d->m_currentJob = TDEIO::file_delete( op.m_dst );
d->m_uiserver->deleting( d->m_uiserverJobId, op.m_dst );
}
else if ( d->m_current.m_type == KonqCommand::MOVE
|| d->m_current.m_type == KonqCommand::TRASH )
{
kdDebug(1203) << "KonqUndoManager::undoStep file_move " << op.m_dst.prettyURL() << " " << op.m_src.prettyURL() << endl;
- d->m_currentJob = KIO::file_move( op.m_dst, op.m_src, -1, true );
+ d->m_currentJob = TDEIO::file_move( op.m_dst, op.m_src, -1, true );
d->m_uiserver->moving( d->m_uiserverJobId, op.m_dst, op.m_src );
}
@@ -485,7 +485,7 @@ void KonqUndoManager::undoRemovingFiles()
{
KURL file = d->m_fileCleanupStack.pop();
kdDebug(1203) << "KonqUndoManager::undoStep file_delete " << file.prettyURL() << endl;
- d->m_currentJob = KIO::file_delete( file );
+ d->m_currentJob = TDEIO::file_delete( file );
d->m_uiserver->deleting( d->m_uiserverJobId, file );
KURL url( file );
@@ -507,7 +507,7 @@ void KonqUndoManager::undoRemovingDirectories()
{
KURL dir = d->m_dirCleanupStack.pop();
kdDebug(1203) << "KonqUndoManager::undoStep rmdir " << dir.prettyURL() << endl;
- d->m_currentJob = KIO::rmdir( dir );
+ d->m_currentJob = TDEIO::rmdir( dir );
d->m_uiserver->deleting( d->m_uiserverJobId, dir );
addDirToUpdate( dir );
}
diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h
index 6be92033b..fa908de67 100644
--- a/libkonq/konq_undo.h
+++ b/libkonq/konq_undo.h
@@ -28,7 +28,7 @@
#include <kurl.h>
#include <libkonq_export.h>
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -72,14 +72,14 @@ class KonqCommandRecorder : public TQObject
{
Q_OBJECT
public:
- KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, KIO::Job *job );
+ KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job );
virtual ~KonqCommandRecorder();
private slots:
- void slotResult( KIO::Job *job );
+ void slotResult( TDEIO::Job *job );
- void slotCopyingDone( KIO::Job *, const KURL &from, const KURL &to, bool directory, bool renamed );
- void slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to );
+ void slotCopyingDone( TDEIO::Job *, const KURL &from, const KURL &to, bool directory, bool renamed );
+ void slotCopyingLinkDone( TDEIO::Job *, const KURL &from, const TQString &target, const KURL &to );
private:
class KonqCommandRecorderPrivate;
@@ -129,7 +129,7 @@ k_dcop:
virtual KonqCommand::Stack get() const;
private slots:
- void slotResult( KIO::Job *job );
+ void slotResult( TDEIO::Job *job );
private:
void undoStep();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 17:04:42 +0000