From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kio/kfile/kcombiview.cpp | 4 +- kio/kfile/kcombiview.h | 4 +- kio/kfile/kcustommenueditor.cpp | 4 +- kio/kfile/kcustommenueditor.h | 6 +- kio/kfile/kdiroperator.cpp | 40 +++++----- kio/kfile/kdiroperator.h | 30 ++++---- kio/kfile/kdirselectdialog.cpp | 18 ++--- kio/kfile/kdirselectdialog.h | 6 +- kio/kfile/kdirsize.cpp | 44 +++++------ kio/kfile/kdirsize.h | 20 ++--- kio/kfile/kdiskfreesp.cpp | 2 +- kio/kfile/kfiledetailview.cpp | 8 +- kio/kfile/kfiledetailview.h | 4 +- kio/kfile/kfiledialog.cpp | 68 ++++++++--------- kio/kfile/kfiledialog.h | 10 +-- kio/kfile/kfileiconview.cpp | 24 +++--- kio/kfile/kfileiconview.h | 8 +- kio/kfile/kfilepreview.cpp | 4 +- kio/kfile/kfilepreview.h | 4 +- kio/kfile/kfilespeedbar.cpp | 8 +- kio/kfile/kfilespeedbar.h | 4 +- kio/kfile/kfileview.cpp | 16 ++-- kio/kfile/kfileview.h | 8 +- kio/kfile/kimagefilepreview.cpp | 20 ++--- kio/kfile/kimagefilepreview.h | 8 +- kio/kfile/knotifydialog.cpp | 8 +- kio/kfile/knotifydialog.h | 4 +- kio/kfile/kopenwith.cpp | 12 +-- kio/kfile/kpropertiesdialog.cpp | 120 +++++++++++++++--------------- kio/kfile/kpropertiesdialog.h | 14 ++-- kio/kfile/krecentdirs.cpp | 8 +- kio/kfile/krecentdocument.cpp | 6 +- kio/kfile/kurlbar.cpp | 20 ++--- kio/kfile/kurlbar.h | 14 ++-- kio/kfile/tests/kcustommenueditortest.cpp | 2 +- 35 files changed, 290 insertions(+), 290 deletions(-) (limited to 'kio/kfile') diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index 8ba9d29bb..3f199fb92 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -305,14 +305,14 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const return (preferred && w == preferred->widget()) ? preferred : other; } -void KCombiView::readConfig( KConfig *config, const TQString& group ) +void KCombiView::readConfig( TDEConfig *config, const TQString& group ) { left->readConfig( config, group ); if ( right ) right->readConfig( config, group ); } -void KCombiView::writeConfig( KConfig *config, const TQString& group ) +void KCombiView::writeConfig( TDEConfig *config, const TQString& group ) { left->writeConfig( config, group ); if ( right ) diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h index 6186ab740..2747c51ad 100644 --- a/kio/kfile/kcombiview.h +++ b/kio/kfile/kcombiview.h @@ -93,8 +93,8 @@ public: virtual void setSorting( TQDir::SortSpec sort ); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); void ensureItemVisible( const KFileItem * ); diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 1c762bfb9..2049860d1 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton() } void -KCustomMenuEditor::load(KConfigBase *cfg) +KCustomMenuEditor::load(TDEConfigBase *cfg) { cfg->setGroup(TQString::null); int count = cfg->readNumEntry("NrOfItems"); @@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg) } void -KCustomMenuEditor::save(KConfigBase *cfg) +KCustomMenuEditor::save(TDEConfigBase *cfg) { // First clear the whole config file. TQStringList groups = cfg->groupList(); diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h index cc20c6204..9112780b0 100644 --- a/kio/kfile/kcustommenueditor.h +++ b/kio/kfile/kcustommenueditor.h @@ -22,7 +22,7 @@ #include class KListView; -class KConfigBase; +class TDEConfigBase; /* * Dialog for editing custom menus. @@ -42,12 +42,12 @@ public: /** * load the custom menu */ - void load(KConfigBase *); + void load(TDEConfigBase *); /** * save the custom menu */ - void save(KConfigBase *); + void save(TDEConfigBase *); public slots: void slotNewItem(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 0f2e9f4e1..1b7e11356 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -90,7 +90,7 @@ public: KActionSeparator *viewActionSeparator; int dropOptions; - KConfig *config; + TDEConfig *config; TQString configGroup; }; @@ -388,13 +388,13 @@ void KDirOperator::mkdir() TQString where = url().pathOrURL(); TQString name = i18n( "New Folder" ); if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() ) - name = KIO::RenameDlg::suggestName( url(), name ); + name = TDEIO::RenameDlg::suggestName( url(), name ); TQString dir = KInputDialog::getText( i18n( "New Folder" ), i18n( "Create new folder in:\n%1" ).arg( where ), name, &ok, this); if (ok) - mkdir( KIO::encodeFileName( dir ), true ); + mkdir( TDEIO::encodeFileName( dir ), true ); } bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) @@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) for ( ; it != dirs.end(); ++it ) { url.addPath( *it ); - exists = KIO::NetAccess::exists( url, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); + exists = TDEIO::NetAccess::exists( url, false, 0 ); + writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() ); } if ( exists ) // url was already existant @@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) return writeOk; } -KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, +TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items, bool ask, bool showProgress ) { return del( items, this, ask, showProgress ); } -KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, +TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items, TQWidget *parent, bool ask, bool showProgress ) { @@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, } if ( doIt ) { - KIO::DeleteJob *job = KIO::del( urls, false, showProgress ); + TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress ); job->setWindow (topLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; @@ -502,7 +502,7 @@ void KDirOperator::deleteSelected() del( *list ); } -KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, +TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items, TQWidget *parent, bool ask, bool showProgress ) { @@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, } if ( doIt ) { - KIO::CopyJob *job = KIO::trash( urls, showProgress ); + TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress ); job->setWindow (topLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; @@ -718,7 +718,7 @@ void KDirOperator::pathChanged() // it may be, that we weren't ready at this time TQApplication::restoreOverrideCursor(); - // when KIO::Job emits finished, the slot will restore the cursor + // when TDEIO::Job emits finished, the slot will restore the cursor TQApplication::setOverrideCursor( tqwaitCursor ); if ( !isReadable( currUrl )) { @@ -812,8 +812,8 @@ bool KDirOperator::checkPreviewSupport() KToggleAction *previewAction = static_cast( myActionCollection->action( "preview" )); bool hasPreviewSupport = false; - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, ConfigGroup ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, ConfigGroup ); if ( kc->readBoolEntry( "Show Default Preview", true ) ) hasPreviewSupport = checkPreviewInternal(); @@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport() bool KDirOperator::checkPreviewInternal() const { - TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); + TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) return false; @@ -1385,8 +1385,8 @@ void KDirOperator::setupMenu(int whichActions) actionMenu->insert( mkdirAction ); if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); - KConfig *globalconfig = TDEGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); + TDEConfig *globalconfig = TDEGlobal::config(); + TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); @@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions() detailedAction->setChecked( KFile::isDetailView( fv )); } -void KDirOperator::readConfig( KConfig *kc, const TQString& group ) +void KDirOperator::readConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) kc->setGroup( oldGroup ); } -void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) +void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items ) m_fileView->updateView( it.current() ); } -void KDirOperator::setViewConfig( KConfig *config, const TQString& group ) +void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group ) { d->config = config; d->configGroup = group; } -KConfig * KDirOperator::viewConfig() +TDEConfig * KDirOperator::viewConfig() { return d->config; } diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index e644f7b98..73798b92c 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -41,7 +41,7 @@ class KActionSeparator; class KActionMenu; class TQWidgetStack; class KProgress; -namespace KIO { +namespace TDEIO { class CopyJob; class DeleteJob; } @@ -60,7 +60,7 @@ namespace KIO { * show either a simple or detailed view and additionally a preview widget * (see setPreviewWidget()). KImageFilePreview is one implementation * of a preview widget, that displays previews for all supported filetypes - * utilizing KIO::PreviewJob. + * utilizing TDEIO::PreviewJob. * * Currently, those classes don't support Drag&Drop out of the box -- there * you have to use your own view-classes. You can use some DnD-aware views @@ -407,16 +407,16 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.1 */ // ### KDE4: make virtual - void setViewConfig( KConfig *config, const TQString& group ); + void setViewConfig( TDEConfig *config, const TQString& group ); /** - * Returns the KConfig object used for saving and restoring view's + * Returns the TDEConfig object used for saving and restoring view's * configuration. - * @returns the KConfig object used for saving and restoring view's + * @returns the TDEConfig object used for saving and restoring view's * configuration. * @since 3.1 */ - KConfig *viewConfig(); + TDEConfig *viewConfig(); /** * Returns the group name used for saving and restoring view's @@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @see setViewConfig * @see writeConfig */ - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Saves the current settings like sorting, simple or detailed view. @@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @see readConfig * @see setViewConfig */ - virtual void writeConfig( KConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null ); /** @@ -482,18 +482,18 @@ class KIO_EXPORT KDirOperator : public TQWidget bool mkdir( const TQString& directory, bool enterDirectory = true ); /** - * Starts and returns a KIO::DeleteJob to delete the given @p items. + * Starts and returns a TDEIO::DeleteJob to delete the given @p items. * * @param items the list of items to be deleted * @param ask specifies whether a confirmation dialog should be shown * @param showProgress passed to the DeleteJob to show a progress dialog */ // ### KDE4: make virtual - KIO::DeleteJob * del( const KFileItemList& items, + TDEIO::DeleteJob * del( const KFileItemList& items, bool ask = true, bool showProgress = true ); /** - * Starts and returns a KIO::DeleteJob to delete the given @p items. + * Starts and returns a TDEIO::DeleteJob to delete the given @p items. * * @param items the list of items to be deleted * @param parent the parent widget used for the confirmation dialog @@ -502,7 +502,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.1 */ // ### KDE4: make virtual - KIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent, + TDEIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent, bool ask = true, bool showProgress = true ); /** @@ -563,7 +563,7 @@ class KIO_EXPORT KDirOperator : public TQWidget void setDropOptions(int options); /** - * Starts and returns a KIO::CopyJob to trash the given @p items. + * Starts and returns a TDEIO::CopyJob to trash the given @p items. * * @param items the list of items to be trashed * @param parent the parent widget used for the confirmation dialog @@ -572,7 +572,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * @since 3.4 */ // ### KDE4: make virtual - KIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent, + TDEIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent, bool ask = true, bool showProgress = true ); protected: @@ -634,7 +634,7 @@ protected: void prepareCompletionObjects(); /** - * Checks if there support from KIO::PreviewJob for the currently + * Checks if there support from TDEIO::PreviewJob for the currently * shown files, taking mimeFilter() and nameFilter() into account * Enables/disables the preview-action accordingly. */ diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 8f8a8b299..48dd3a2e4 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -267,20 +267,20 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) } } -void KDirSelectDialog::readConfig( KConfig *config, const TQString& group ) +void KDirSelectDialog::readConfig( TDEConfig *config, const TQString& group ) { d->urlCombo->clear(); - KConfigGroup conf( config, group ); + TDEConfigGroup conf( config, group ); d->urlCombo->setHistoryItems( conf.readPathListEntry( "History Items" )); TQSize defaultSize( 400, 450 ); resize( conf.readSizeEntry( "DirSelectDialog Size", &defaultSize )); } -void KDirSelectDialog::saveConfig( KConfig *config, const TQString& group ) +void KDirSelectDialog::saveConfig( TDEConfig *config, const TQString& group ) { - KConfigGroup conf( config, group ); + TDEConfigGroup conf( config, group ); conf.writePathEntry( "History Items", d->urlCombo->historyItems(), ',', true, true); conf.writeEntry( "DirSelectDialog Size", size(), true, true ); @@ -406,9 +406,9 @@ void KDirSelectDialog::slotMkdir() TQString where = url().pathOrURL(); TQString name = i18n( "New Folder" ); if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() ) - name = KIO::RenameDlg::suggestName( url(), name ); + name = TDEIO::RenameDlg::suggestName( url(), name ); - TQString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ), + TQString directory = TDEIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ), i18n( "Create new folder in:\n%1" ).arg( where ), name, &ok, this)); if (!ok) @@ -425,8 +425,8 @@ void KDirSelectDialog::slotMkdir() for ( ; it != dirs.end(); ++it ) { folderurl.addPath( *it ); - exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + exists = TDEIO::NetAccess::exists( folderurl, false, 0 ); + writeOk = !exists && TDEIO::NetAccess::mkdir( folderurl, topLevelWidget() ); } if ( exists ) // url was already existant @@ -470,7 +470,7 @@ KURL KDirSelectDialog::selectDirectory( const TQString& startDir, myDialog.setCaption( caption ); if ( myDialog.exec() == TQDialog::Accepted ) - return KIO::NetAccess::mostLocalURL(myDialog.url(),parent); + return TDEIO::NetAccess::mostLocalURL(myDialog.url(),parent); else return KURL(); } diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h index 79358f4f3..106fe77fc 100644 --- a/kio/kfile/kdirselectdialog.h +++ b/kio/kfile/kdirselectdialog.h @@ -25,7 +25,7 @@ class TQPopupMenu; class TQVBoxLayout; -class KConfig; +class TDEConfig; class KFileTreeBranch; class KFileTreeView; class KFileTreeViewItem; @@ -111,8 +111,8 @@ private slots: void slotMkdir(); private: - void readConfig( KConfig *config, const TQString& group ); - void saveConfig( KConfig *config, const TQString& group ); + void readConfig( TDEConfig *config, const TQString& group ); + void saveConfig( TDEConfig *config, const TQString& group ); void openNextDir( KFileTreeViewItem *parent ); KFileTreeBranch * createBranch( const KURL& url ); diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 3ab42817b..14936679a 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -24,16 +24,16 @@ #include #include -using namespace KIO; +using namespace TDEIO; KDirSize::KDirSize( const KURL & directory ) - : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L) + : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L) { startNextJob( directory ); } KDirSize::KDirSize( const KFileItemList & lstItems ) - : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) + : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); } @@ -69,38 +69,38 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { - KIO::ListJob * listJob = KIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( KIO::Job *, - const KIO::UDSEntryList& )), - TQT_SLOT( slotEntries( KIO::Job*, - const KIO::UDSEntryList& ))); + TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); + connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + const TDEIO::UDSEntryList& )), + TQT_SLOT( slotEntries( TDEIO::Job*, + const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } -void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) +void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list ) { static const TQString& dot = TDEGlobal::staticQString( "." ); static const TQString& dotdot = TDEGlobal::staticQString( ".." ); - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); - KIO::filesize_t size = 0; + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); + TDEIO::filesize_t size = 0; bool isLink = false; bool isDir = false; TQString name; for( ; it2 != (*it).end(); it2++ ) { switch( (*it2).m_uds ) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: name = (*it2).m_str; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: isLink = !(*it2).m_str.isEmpty(); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: size = ((*it2).m_long); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: isDir = S_ISDIR((*it2).m_long); break; default: @@ -135,7 +135,7 @@ KDirSize * KDirSize::dirSizeJob( const KFileItemList & lstItems ) } //static -KIO::filesize_t KDirSize::dirSize( const KURL & directory ) +TDEIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); @@ -144,9 +144,9 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) } -void KDirSize::slotResult( KIO::Job * job ) +void KDirSize::slotResult( TDEIO::Job * job ) { - kdDebug(kfile_area) << " KDirSize::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; + kdDebug(kfile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl; if ( !m_lstItems.isEmpty() ) { subjobs.remove(job); // Remove job, but don't kill this job. @@ -156,11 +156,11 @@ void KDirSize::slotResult( KIO::Job * job ) { if ( !m_bAsync ) tqApp->exit_loop(); - KIO::Job::slotResult( job ); + TDEIO::Job::slotResult( job ); } } void KDirSize::virtual_hook( int id, void* data ) -{ KIO::Job::virtual_hook( id, data ); } +{ TDEIO::Job::virtual_hook( id, data ); } #include "kdirsize.moc" diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h index 64ae80765..41fe87eb6 100644 --- a/kio/kfile/kdirsize.h +++ b/kio/kfile/kdirsize.h @@ -27,7 +27,7 @@ * Computes a directory size (similar to "du", but doesn't give the same results * since we simply sum up the dir and file sizes, whereas du speaks disk blocks) */ -class KIO_EXPORT KDirSize : public KIO::Job +class KIO_EXPORT KDirSize : public TDEIO::Job { Q_OBJECT protected: @@ -39,14 +39,14 @@ public: /** * @return the size we found */ - KIO::filesize_t totalSize() const { return m_totalSize; } + TDEIO::filesize_t totalSize() const { return m_totalSize; } /** * @return the total number of files (counting symlinks to files, sockets * and character devices as files) in this directory and all sub-directories * @since 3.3 */ - KIO::filesize_t totalFiles() const { return m_totalFiles; } + TDEIO::filesize_t totalFiles() const { return m_totalFiles; } /** * @return the total number of sub-directories found (not including the @@ -54,7 +54,7 @@ public: * as directories) * @since 3.3 */ - KIO::filesize_t totalSubdirs() const { return m_totalSubdirs; } + TDEIO::filesize_t totalSubdirs() const { return m_totalSubdirs; } /** * Asynchronous method. Connect to the result signal. @@ -75,7 +75,7 @@ public: * Synchronous method - you get the result as soon as * the call returns. */ - static KIO::filesize_t dirSize( const KURL & directory ); + static TDEIO::filesize_t dirSize( const KURL & directory ); protected: /** @@ -87,15 +87,15 @@ protected: protected slots: - virtual void slotResult( KIO::Job *job ); - void slotEntries( KIO::Job * , const KIO::UDSEntryList &); + virtual void slotResult( TDEIO::Job *job ); + void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList &); void processList(); private: bool m_bAsync; - KIO::filesize_t m_totalSize; - KIO::filesize_t m_totalFiles; - KIO::filesize_t m_totalSubdirs; + TDEIO::filesize_t m_totalSize; + TDEIO::filesize_t m_totalFiles; + TDEIO::filesize_t m_totalSubdirs; KFileItemList m_lstItems; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 21338c058..18245bdcd 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -163,7 +163,7 @@ void KDiskFreeSp::dfDone() KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path ) { KDiskFreeSp * job = new KDiskFreeSp; - TQString mountPoint = KIO::findPathMountPoint( path ); + TQString mountPoint = TDEIO::findPathMountPoint( path ); job->readDF( mountPoint ); return job; } diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 1bc6f6257..099a7cee5 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -130,12 +130,12 @@ KFileDetailView::~KFileDetailView() delete d; } -void KFileDetailView::readConfig( KConfig *config, const TQString& group ) +void KFileDetailView::readConfig( TDEConfig *config, const TQString& group ) { restoreLayout( config, group ); } -void KFileDetailView::writeConfig( KConfig *config, const TQString& group ) +void KFileDetailView::writeConfig( TDEConfig *config, const TQString& group ) { saveLayout( config, group ); } @@ -327,7 +327,7 @@ void KFileDetailView::setSortingKey( KFileListViewItem *item, TQDir::SortSpec spec = KFileView::sorting(); if ( spec & TQDir::Time ) - item->setKey( sortingKey( i->time( KIO::UDS_MODIFICATION_TIME ), + item->setKey( sortingKey( i->time( TDEIO::UDS_MODIFICATION_TIME ), i->isDir(), spec )); else if ( spec & TQDir::Size ) item->setKey( sortingKey( i->size(), i->isDir(), spec )); @@ -399,7 +399,7 @@ void KFileDetailView::slotSortingChanged( int col ) if ( sortSpec & TQDir::Time ) { for ( ; (item = it.current()); ++it ) - viewItem(item)->setKey( sortingKey( item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec )); + viewItem(item)->setKey( sortingKey( item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec )); } else if ( sortSpec & TQDir::Size ) { diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..9c41cfb91 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -149,8 +149,8 @@ public: void determineIcon( KFileListViewItem *item ); TQScrollView *scrollWidget() const { return (TQScrollView*) this; } - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); signals: /** diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 5e1634144..1538d5dbc 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -97,7 +97,7 @@ enum Buttons { HOTLIST_BUTTON, PATH_COMBO, CONFIGURE_BUTTON }; -template class TQPtrList; +template class TQPtrList; namespace { static void silenceQToolBar(TQtMsgType, const char *) @@ -136,7 +136,7 @@ struct KFileDialogPrivate bool autoSelectExtChecked; // whether or not the _user_ has checked the above box TQString extension; // current extension for this filter - TQPtrList statJobs; + TQPtrList statJobs; KURL::List urlList; //the list of selected urls @@ -185,7 +185,7 @@ KFileDialog::~KFileDialog() { hide(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); if (d->urlBar) d->urlBar->save( config ); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -528,12 +528,12 @@ void KFileDialog::slotOk() if (!kapp->authorizeURLAction("open", KURL(), d->url)) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, d->url.prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL()); KMessageBox::error( d->mainWidget, msg); return; } - KIO::StatJob *job = 0L; + TDEIO::StatJob *job = 0L; d->statJobs.clear(); d->filenames = KShell::tildeExpand(locationEdit->currentText()); @@ -546,7 +546,7 @@ void KFileDialog::slotOk() { if (!kapp->authorizeURLAction("open", KURL(), *it)) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, (*it).prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL()); KMessageBox::error( d->mainWidget, msg); return; } @@ -554,32 +554,32 @@ void KFileDialog::slotOk() for ( KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it ) { - job = KIO::stat( *it, !(*it).isLocalFile() ); + job = TDEIO::stat( *it, !(*it).isLocalFile() ); job->setWindow (topLevelWidget()); - KIO::Scheduler::scheduleJob( job ); + TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - TQT_SLOT( slotStatResult( KIO::Job *) )); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + TQT_SLOT( slotStatResult( TDEIO::Job *) )); } return; } - job = KIO::stat(d->url,!d->url.isLocalFile()); + job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); } -static bool isDirectory (const KIO::UDSEntry &t) +static bool isDirectory (const TDEIO::UDSEntry &t) { bool isDir = false; - for (KIO::UDSEntry::ConstIterator it = t.begin(); + for (TDEIO::UDSEntry::ConstIterator it = t.begin(); it != t.end(); it++) { - if ((*it).m_uds == KIO::UDS_FILE_TYPE) + if ((*it).m_uds == TDEIO::UDS_FILE_TYPE) { isDir = S_ISDIR ((mode_t) ((*it).m_long)); break; @@ -592,10 +592,10 @@ static bool isDirectory (const KIO::UDSEntry &t) // FIXME : count all errors and show messagebox when d->statJobs.count() == 0 // in case of an error, we cancel the whole operation (clear d->statJobs and // don't call accept) -void KFileDialog::slotStatResult(KIO::Job* job) +void KFileDialog::slotStatResult(TDEIO::Job* job) { kdDebug(kfile_area) << "slotStatResult" << endl; - KIO::StatJob *sJob = static_cast( job ); + TDEIO::StatJob *sJob = static_cast( job ); if ( !d->statJobs.removeRef( sJob ) ) { return; @@ -611,7 +611,7 @@ void KFileDialog::slotStatResult(KIO::Job* job) return; } - KIO::UDSEntry t = sJob->statResult(); + TDEIO::UDSEntry t = sJob->statResult(); if (isDirectory (t)) { if ( ops->dirOnlyMode() ) @@ -672,7 +672,7 @@ void KFileDialog::accept() locationEdit->insertItem( file, 1 ); } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge initGUI(); // activate GM - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); readRecentFiles( config ); adjustSize(); @@ -1550,7 +1550,7 @@ TQString KFileDialog::selectedFile() const { if ( result() == TQDialog::Accepted ) { - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if (url.isLocalFile()) return url.path(); else { @@ -1572,7 +1572,7 @@ TQStringList KFileDialog::selectedFiles() const KURL::List urls = parseSelectedURLs(); TQValueListConstIterator it = urls.begin(); while ( it != urls.end() ) { - url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + url = TDEIO::NetAccess::mostLocalURL(*it,topLevelWidget()); if ( url.isLocalFile() ) list.append( url.path() ); ++it; @@ -1698,7 +1698,7 @@ KFile::Mode KFileDialog::mode() const } -void KFileDialog::readConfig( KConfig *kc, const TQString& group ) +void KFileDialog::readConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1749,7 +1749,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) kc->setGroup( oldGroup ); } -void KFileDialog::writeConfig( KConfig *kc, const TQString& group ) +void KFileDialog::writeConfig( TDEConfig *kc, const TQString& group ) { if ( !kc ) return; @@ -1771,7 +1771,7 @@ void KFileDialog::writeConfig( KConfig *kc, const TQString& group ) } -void KFileDialog::readRecentFiles( KConfig *kc ) +void KFileDialog::readRecentFiles( TDEConfig *kc ) { TQString oldGroup = kc->group(); kc->setGroup( ConfigGroup ); @@ -1786,7 +1786,7 @@ void KFileDialog::readRecentFiles( KConfig *kc ) kc->setGroup( oldGroup ); } -void KFileDialog::saveRecentFiles( KConfig *kc ) +void KFileDialog::saveRecentFiles( TDEConfig *kc ) { TQString oldGroup = kc->group(); kc->setGroup( ConfigGroup ); @@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel() ops->close(); KDialogBase::slotCancel(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -2069,8 +2069,8 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) ) { // exists? - KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + TDEIO::UDSEntry t; + if (TDEIO::NetAccess::stat (url, t, topLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2142,13 +2142,13 @@ void KFileDialog::appendExtension (KURL &url) const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); - // don't KIO::NetAccess::Stat if unnecessary + // don't TDEIO::NetAccess::Stat if unnecessary if (!(suppressExtension || unspecifiedExtension)) return; // exists? - KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + TDEIO::UDSEntry t; + if (TDEIO::NetAccess::stat (url, t, topLevelWidget())) { kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl; return; diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 33e0c9b12..51d817b2f 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -854,22 +854,22 @@ protected: /** * Reads configuration and applies it (size, recent directories, ...) */ - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Saves the current configuration */ - virtual void writeConfig( KConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null ); /** * Reads the recent used files and inserts them into the location combobox */ - virtual void readRecentFiles( KConfig * ); + virtual void readRecentFiles( TDEConfig * ); /** * Saves the entries from the location combobox. */ - virtual void saveRecentFiles( KConfig * ); + virtual void saveRecentFiles( TDEConfig * ); /** * Parses the string "line" for files. If line doesn't contain any ", the @@ -929,7 +929,7 @@ protected slots: void slotFilterChanged(); void fileHighlighted(const KFileItem *i); void fileSelected(const KFileItem *i); - void slotStatResult(KIO::Job* job); + void slotStatResult(TDEIO::Job* job); void slotLoadingFinished(); void fileCompletion( const TQString& ); diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index a9882d56f..5d9977de6 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -102,7 +102,7 @@ public: KRadioAction *smallColumns, *largeRows; KAction *zoomIn, *zoomOut; KToggleAction *previews; - KIO::PreviewJob *job; + TDEIO::PreviewJob *job; KFileIconViewItem *dropItem; TQTimer previewTimer; TQTimer autoOpenTimer; @@ -187,10 +187,10 @@ KFileIconView::~KFileIconView() delete d; } -void KFileIconView::readConfig( KConfig *kc, const TQString& group ) +void KFileIconView::readConfig( TDEConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; - KConfigGroupSaver cs( kc, gr ); + TDEConfigGroupSaver cs( kc, gr ); TQString small = TQString::fromLatin1("SmallColumns"); d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE ); d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) ); @@ -208,10 +208,10 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group ) showPreviews(); } -void KFileIconView::writeConfig( KConfig *kc, const TQString& group ) +void KFileIconView::writeConfig( TDEConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; - KConfigGroupSaver cs( kc, gr ); + TDEConfigGroupSaver cs( kc, gr ); TQString viewMode = d->smallColumns->isChecked() ? TQString::fromLatin1("SmallColumns") : @@ -578,7 +578,7 @@ void KFileIconView::slotPreviewsToggled( bool on ) void KFileIconView::showPreviews() { if ( d->previewMimeTypes.isEmpty() ) - d->previewMimeTypes = KIO::PreviewJob::supportedMimeTypes(); + d->previewMimeTypes = TDEIO::PreviewJob::supportedMimeTypes(); stopPreview(); d->previews->setChecked( true ); @@ -591,18 +591,18 @@ void KFileIconView::showPreviews() updateIcons(); } - d->job = KIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); + d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( KIO::Job * )), - this, TQT_SLOT( slotPreviewResult( KIO::Job * ))); + connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), + this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); // connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), // this, TQT_SLOT( slotFailed( const KFileItem* ) )); } -void KFileIconView::slotPreviewResult( KIO::Job *job ) +void KFileIconView::slotPreviewResult( TDEIO::Job *job ) { if ( job == d->job ) d->job = 0L; @@ -683,7 +683,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec ) if ( spec & TQDir::Time ) { for ( ; (item = it.current()); ++it ) // warning, time_t is often signed -> cast it - viewItem(item)->setKey( sortingKey( (unsigned long)item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), spec )); + viewItem(item)->setKey( sortingKey( (unsigned long)item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), spec )); } else if ( spec & TQDir::Size ) { @@ -775,7 +775,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( spec & TQDir::Time ) // warning, time_t is often signed -> cast it - item->setKey( sortingKey( (unsigned long) i->time( KIO::UDS_MODIFICATION_TIME ), + item->setKey( sortingKey( (unsigned long) i->time( TDEIO::UDS_MODIFICATION_TIME ), i->isDir(), spec )); else if ( spec & TQDir::Size ) item->setKey( sortingKey( i->size(), i->isDir(), spec )); diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h index a4fd34ea1..209e4828a 100644 --- a/kio/kfile/kfileiconview.h +++ b/kio/kfile/kfileiconview.h @@ -68,7 +68,7 @@ private: }; -namespace KIO { +namespace TDEIO { class Job; } @@ -141,8 +141,8 @@ public: virtual void setSorting(TQDir::SortSpec sort); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); // for KMimeTypeResolver void mimeTypeDeterminationFinished(); @@ -212,7 +212,7 @@ private slots: void slotLargeRows(); void slotPreviewsToggled( bool ); - void slotPreviewResult( KIO::Job * ); + void slotPreviewResult( TDEIO::Job * ); void gotPreview( const KFileItem *item, const TQPixmap& pix ); void slotAutoOpen(); diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index b221a1ebb..04124570b 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -264,12 +264,12 @@ KActionCollection * KFilePreview::actionCollection() const } } -void KFilePreview::readConfig( KConfig *config, const TQString& group ) +void KFilePreview::readConfig( TDEConfig *config, const TQString& group ) { left->readConfig( config, group ); } -void KFilePreview::writeConfig( KConfig *config, const TQString& group ) +void KFilePreview::writeConfig( TDEConfig *config, const TQString& group ) { left->writeConfig( config, group ); } diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 123d221f1..79dda2984 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -83,8 +83,8 @@ public: virtual void setSorting( TQDir::SortSpec sort ); - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); /** * This overrides KFileView::actionCollection() by returning diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 9ab3b8ee5..567d929eb 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -35,8 +35,8 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) : KURLBar( true, parent, name ) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", true ); setIconSize(KIcon::SizeSmallMedium); @@ -121,11 +121,11 @@ KFileSpeedBar::~KFileSpeedBar() { } -void KFileSpeedBar::save( KConfig *config ) +void KFileSpeedBar::save( TDEConfig *config ) { if ( m_initializeSpeedbar && isModified() ) { - KConfigGroup conf( config, ConfigGroup ); + TDEConfigGroup conf( config, ConfigGroup ); // write to kdeglobals conf.writeEntry( "Set speedbar defaults", false, true, true ); } diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 28c621651..f7a27131b 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -21,7 +21,7 @@ #include -class KConfig; +class TDEConfig; class KIO_EXPORT KFileSpeedBar : public KURLBar { @@ -30,7 +30,7 @@ public: KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 ); ~KFileSpeedBar(); - virtual void save( KConfig *config ); + virtual void save( TDEConfig *config ); virtual TQSize sizeHint() const; private: diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index b32746aa6..a62b8aa50 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -212,8 +212,8 @@ sort_by_name: break; case TQDir::Time: { - time_t t1 = fi1->time( KIO::UDS_MODIFICATION_TIME ); - time_t t2 = fi2->time( KIO::UDS_MODIFICATION_TIME ); + time_t t1 = fi1->time( TDEIO::UDS_MODIFICATION_TIME ); + time_t t2 = fi2->time( TDEIO::UDS_MODIFICATION_TIME ); if ( t1 != t2 ) { bigger = (t1 > t2); break; @@ -228,8 +228,8 @@ sort_by_name: } case TQDir::Size: { - KIO::filesize_t s1 = fi1->size(); - KIO::filesize_t s2 = fi2->size(); + TDEIO::filesize_t s1 = fi1->size(); + TDEIO::filesize_t s2 = fi2->size(); if ( s1 != s2 ) { bigger = (s1 > s2); break; @@ -369,11 +369,11 @@ KActionCollection * KFileView::actionCollection() const return d->actions; } -void KFileView::readConfig( KConfig *, const TQString& ) +void KFileView::readConfig( TDEConfig *, const TQString& ) { } -void KFileView::writeConfig( KConfig *, const TQString& ) +void KFileView::writeConfig( TDEConfig *, const TQString& ) { } @@ -386,12 +386,12 @@ TQString KFileView::sortingKey( const TQString& value, bool isDir, int sortSpec return result.prepend( start ); } -TQString KFileView::sortingKey( KIO::filesize_t value, bool isDir, int sortSpec) +TQString KFileView::sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec) { bool reverse = sortSpec & TQDir::Reversed; bool dirsFirst = sortSpec & TQDir::DirsFirst; char start = (isDir && dirsFirst) ? (reverse ? '2' : '0') : '1'; - return KIO::number( value ).rightJustify( 24, '0' ).prepend( start ); + return TDEIO::number( value ).rightJustify( 24, '0' ).prepend( start ); } void KFileView::setDropOptions(int options) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index bce408327..5a6bfd002 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -346,8 +346,8 @@ public: KFileViewSignaler * signaler() const { return sig; } - virtual void readConfig( KConfig *, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig *, const TQString& group = TQString::null); + virtual void readConfig( TDEConfig *, const TQString& group = TQString::null ); + virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null); /** * Various options for drag and drop support. @@ -392,10 +392,10 @@ public: /** * An overloaded method that takes not a TQString, but a number as sort * criterion. You can use this for file-sizes or dates/times for example. - * If you use a time_t, you need to cast that to KIO::filesize_t because + * If you use a time_t, you need to cast that to TDEIO::filesize_t because * of ambiguity problems. */ - static TQString sortingKey( KIO::filesize_t value, bool isDir,int sortSpec); + static TQString sortingKey( TDEIO::filesize_t value, bool isDir,int sortSpec); /** * @internal diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index c55acaf9e..0cc0ef2a7 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -35,8 +35,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) : KPreviewWidgetBase( parent ), m_job( 0L ) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); autoMode = config->readBoolEntry( "Automatic Preview", true ); TQVBoxLayout *vb = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -62,7 +62,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) timer = new TQTimer( this ); connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); - setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() ); + setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } KImageFilePreview::~KImageFilePreview() @@ -70,8 +70,8 @@ KImageFilePreview::~KImageFilePreview() if ( m_job ) m_job->kill(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, ConfigGroup ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, ConfigGroup ); config->writeEntry( "Automatic Preview", autoPreview->isChecked() ); } @@ -109,8 +109,8 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * )), - this, TQT_SLOT( slotResult( KIO::Job * ))); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), + this, TQT_SLOT( slotResult( TDEIO::Job * ))); connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); @@ -142,11 +142,11 @@ TQSize KImageFilePreview::sizeHint() const return TQSize( 20, 200 ); // otherwise it ends up huge??? } -KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h ) +TDEIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h ) { KURL::List urls; urls.append( url ); - return KIO::filePreview( urls, w, h, 0, 0, true, false ); + return TDEIO::filePreview( urls, w, h, 0, 0, true, false ); } void KImageFilePreview::gotPreview( const KFileItem* item, const TQPixmap& pm ) @@ -164,7 +164,7 @@ void KImageFilePreview::slotFailed( const KFileItem* item ) KIcon::DisabledState )); } -void KImageFilePreview::slotResult( KIO::Job *job ) +void KImageFilePreview::slotResult( TDEIO::Job *job ) { if ( job == m_job ) m_job = 0L; diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 864fc5d31..a86f4f923 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -23,7 +23,7 @@ class TQTimer; class KFileDialog; class KFileItem; -namespace KIO { class Job; class PreviewJob; } +namespace TDEIO { class Job; class PreviewJob; } /** * Image preview widget for the file dialog. @@ -51,11 +51,11 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase protected: virtual void resizeEvent(TQResizeEvent *e); - virtual KIO::PreviewJob * createJob( const KURL& url, + virtual TDEIO::PreviewJob * createJob( const KURL& url, int w, int h ); private slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); virtual void slotFailed( const KFileItem* ); private: @@ -66,7 +66,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase TQLabel *infoLabel; TQCheckBox *autoPreview; TQPushButton *previewButton; - KIO::PreviewJob *m_job; + TDEIO::PreviewJob *m_job; protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 69d7be4e8..088f9be54 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -915,7 +915,7 @@ void KNotifyWidget::openExecDialog( KURLRequester *requester ) void KNotifyWidget::playSound() { TQString soundPath = m_soundPath->url(); - if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { + if (!TDEIO::NetAccess::exists( m_soundPath->url(), true, 0 )) { bool foundSound=false; // find the first "sound"-resource that contains files @@ -930,7 +930,7 @@ void KNotifyWidget::playSound() while ( it != soundDirs.end() ) { dir = *it; if ( dir.isReadable() && dir.count() > 2 && - KIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) { + TDEIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) { foundSound=true; soundPath = *it + m_soundPath->url(); break; @@ -1003,8 +1003,8 @@ Application::Application( const TQString &path ) TQString config_file = path; config_file[config_file.find('/')] = '.'; m_events = 0L; - config = new KConfig(config_file, false, false); - kc = new KConfig(path, true, false, "data"); + config = new TDEConfig(config_file, false, false); + kc = new TDEConfig(path, true, false, "data"); kc->setGroup( TQString::fromLatin1("!Global!") ); m_icon = kc->readEntry(TQString::fromLatin1("IconName"), TQString::fromLatin1("misc")); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index ef5d356fd..acab7e23f 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -168,8 +168,8 @@ namespace KNotify TQString m_appname; EventList *m_events; - KConfig *kc; // The file that defines the events. - KConfig *config; // The file that contains the settings for the events + TDEConfig *kc; // The file that defines the events. + TDEConfig *config; // The file that contains the settings for the events }; diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 9a3fcabd1..efeaa1f02 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -412,8 +412,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // init the history combo and insert it into the URL-Requester KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), @@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") @@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using @@ -813,8 +813,8 @@ void KOpenWithDlg::accept() if ( combo ) { combo->addToHistory( edit->url() ); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); kc->writeEntry(TQString::fromLatin1("CompletionMode"), combo->completionMode()); diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 94b95a2b6..e9296ca90 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -146,7 +146,7 @@ static TQString nameFromFileName(TQString nameStr) if ( nameStr.endsWith(".kdelnk") ) nameStr.truncate( nameStr.length() - 7 ); // Make it human-readable (%2F => '/', ...) - nameStr = KIO::decodeFileName( nameStr ); + nameStr = TDEIO::decodeFileName( nameStr ); return nameStr; } @@ -174,7 +174,7 @@ public: KPropertiesDialog::KPropertiesDialog (KFileItem* item, TQWidget* parent, const char* name, bool modal, bool autoShow) - : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(KIO::decodeFileName(item->url().fileName())), + : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(item->url().fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal) { @@ -206,7 +206,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items, // TODO: replace with "Properties for 1 item". It's very confusing how it has to be translated otherwise // (empty translation before the "\n" is not allowed by msgfmt...) _items.count()>1 ? i18n( "","Properties for %n Selected Items",_items.count()) : - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_items.first()->url().fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal) { @@ -229,16 +229,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, mode_t /* _mode is now u TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), m_singleUrl( _url ) { d = new KPropertiesDialogPrivate; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::NetAccess::stat(_url, entry, parent); + TDEIO::NetAccess::stat(_url, entry, parent); m_items.append( new KFileItem( entry, _url ) ); init (modal, autoShow); @@ -249,16 +249,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), m_singleUrl( _url ) { d = new KPropertiesDialogPrivate; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::NetAccess::stat(_url, entry, parent); + TDEIO::NetAccess::stat(_url, entry, parent); m_items.append( new KFileItem( entry, _url ) ); init (modal, autoShow); @@ -269,7 +269,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current TQWidget* parent, const char* name, bool modal, bool autoShow) : KDialogBase (KDialogBase::Tabbed, - i18n( "Properties for %1" ).arg(KIO::decodeFileName(_tempUrl.fileName())), + i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_tempUrl.fileName())), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent, name, modal), @@ -360,7 +360,7 @@ void KPropertiesDialog::setFileNameReadOnly( bool ro ) } } -void KPropertiesDialog::slotStatResult( KIO::Job * ) +void KPropertiesDialog::slotStatResult( TDEIO::Job * ) { } @@ -725,7 +725,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) TQString mimeComment = item->mimeComment(); d->mimeType = item->mimetype(); bool hasTotalSize; - KIO::filesize_t totalSize = item->size(hasTotalSize); + TDEIO::filesize_t totalSize = item->size(hasTotalSize); TQString magicMimeComment; if ( isLocal ) { KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() ); @@ -894,7 +894,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQLabel *lab = new TQLabel(d->m_frame ); if ( d->bMultiple ) - lab->setText( KIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) ); + lab->setText( TDEIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) ); else lab->setText( filename ); nameArea = lab; @@ -992,7 +992,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !hasDirs ) // Only files [and symlinks] { if(hasTotalSize) { - m_sizeLabel->setText(KIO::convertSizeWithBytes(totalSize)); + m_sizeLabel->setText(TDEIO::convertSizeWithBytes(totalSize)); } m_sizeDetermineButton = 0L; @@ -1034,7 +1034,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQDateTime dt; bool hasTime; - time_t tim = item->time(KIO::UDS_CREATION_TIME, hasTime); + time_t tim = item->time(TDEIO::UDS_CREATION_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Created:"), d->m_frame ); @@ -1045,7 +1045,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow++, 2); } - tim = item->time(KIO::UDS_MODIFICATION_TIME, hasTime); + tim = item->time(TDEIO::UDS_MODIFICATION_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Modified:"), d->m_frame ); @@ -1056,7 +1056,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow++, 2); } - tim = item->time(KIO::UDS_ACCESS_TIME, hasTime); + tim = item->time(TDEIO::UDS_ACCESS_TIME, hasTime); if ( hasTime ) { l = new TQLabel(i18n("Accessed:"), d->m_frame ); @@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addMultiCellWidget(sep, curRow, curRow, 0, 2); ++curRow; - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); if (mountPoint != "/") { @@ -1193,8 +1193,8 @@ void KFilePropsPlugin::slotFoundMountPoint( const TQString&, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); } @@ -1208,34 +1208,34 @@ void KFilePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); } void KFilePropsPlugin::slotDirSizeUpdate() { - KIO::filesize_t totalSize = d->dirSizeJob->totalSize(); - KIO::filesize_t totalFiles = d->dirSizeJob->totalFiles(); - KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); + TDEIO::filesize_t totalSize = d->dirSizeJob->totalSize(); + TDEIO::filesize_t totalFiles = d->dirSizeJob->totalFiles(); + TDEIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4") - .arg(KIO::convertSize(totalSize)) + .arg(TDEIO::convertSize(totalSize)) .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } -void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) +void KFilePropsPlugin::slotDirSizeFinished( TDEIO::Job * job ) { if (job->error()) m_sizeLabel->setText( job->errorString() ); else { - KIO::filesize_t totalSize = static_cast(job)->totalSize(); - KIO::filesize_t totalFiles = static_cast(job)->totalFiles(); - KIO::filesize_t totalSubdirs = static_cast(job)->totalSubdirs(); + TDEIO::filesize_t totalSize = static_cast(job)->totalSize(); + TDEIO::filesize_t totalFiles = static_cast(job)->totalFiles(); + TDEIO::filesize_t totalSubdirs = static_cast(job)->totalSubdirs(); m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") - .arg(KIO::convertSize(totalSize)) + .arg(TDEIO::convertSize(totalSize)) .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); @@ -1259,8 +1259,8 @@ void KFilePropsPlugin::slotSizeDetermine() connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( KIO::Job * ) ) ); + connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine() bool isLocal; KFileItem * item = properties->item(); KURL url = item->mostLocalURL( isLocal ); - TQString mountPoint = KIO::findPathMountPoint( url.path() ); + TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, @@ -1334,10 +1334,10 @@ void KFilePropsPlugin::applyChanges() kdDebug(250) << "oldname = " << oldName << endl; kdDebug(250) << "newname = " << n << endl; if ( oldName != n || m_bFromTemplate ) { // true for any from-template file - KIO::Job * job = 0L; + TDEIO::Job * job = 0L; KURL oldurl = properties->kurl(); - TQString newFileName = KIO::encodeFileName(n); + TQString newFileName = TDEIO::encodeFileName(n); if (d->bDesktopFile && !newFileName.endsWith(".desktop") && !newFileName.endsWith(".kdelnk")) newFileName += ".desktop"; @@ -1353,14 +1353,14 @@ void KFilePropsPlugin::applyChanges() // Don't remove the template !! if ( !m_bFromTemplate ) // (normal renaming) - job = KIO::move( oldurl, properties->kurl() ); + job = TDEIO::move( oldurl, properties->kurl() ); else // Copying a template - job = KIO::copy( oldurl, properties->kurl() ); + job = TDEIO::copy( oldurl, properties->kurl() ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1378,7 +1378,7 @@ void KFilePropsPlugin::applyChanges() slotCopyFinished( 0L ); } -void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) +void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) { kdDebug(250) << "KFilePropsPlugin::slotCopyFinished" << endl; if (job) @@ -1389,7 +1389,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) { job->showErrorDialog( d->m_frame ); // Didn't work. Revert the URL to the old one - properties->updateUrl( static_cast(job)->srcURLs().first() ); + properties->updateUrl( static_cast(job)->srcURLs().first() ); properties->abortApplying(); // Don't apply the changes to the wrong file ! return; } @@ -1431,9 +1431,9 @@ void KFilePropsPlugin::applyIconChanges() if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now - // TODO: Use KTempFile and KIO::file_copy with overwrite = true + // TODO: Use KTempFile and TDEIO::file_copy with overwrite = true KURL url = properties->kurl(); - url = KIO::NetAccess::mostLocalURL( url, properties ); + url = TDEIO::NetAccess::mostLocalURL( url, properties ); if (url.isLocalFile()) { TQString path; @@ -1478,7 +1478,7 @@ void KFilePropsPlugin::applyIconChanges() } } -void KFilePropsPlugin::slotFileRenamed( KIO::Job *, const KURL &, const KURL & newUrl ) +void KFilePropsPlugin::slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & newUrl ) { // This is called in case of an existing local file during the copy/move operation, // if the user chooses Rename. @@ -1633,7 +1633,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr } else { //We don't know, for remote files, if they are ours or not. //So we let the user change permissions, and - //KIO::chmod will tell, if he had no right to do it. + //TDEIO::chmod will tell, if he had no right to do it. isMyFile = true; } @@ -2506,17 +2506,17 @@ void KFilePermissionsPropsPlugin::applyChanges() && !permissionChange && !ACLChange && !defaultACLChange ) return; - KIO::Job * job; + TDEIO::Job * job; if (files.count() > 0) { - job = KIO::chmod( files, orFilePermissions, ~andFilePermissions, + job = TDEIO::chmod( files, orFilePermissions, ~andFilePermissions, owner, group, false ); if ( ACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" ); if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2524,15 +2524,15 @@ void KFilePermissionsPropsPlugin::applyChanges() tqt_leave_modal(&dummy); } if (dirs.count() > 0) { - job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions, + job = TDEIO::chmod( dirs, orDirPermissions, ~andDirPermissions, owner, group, recursive ); if ( ACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" ); if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2541,7 +2541,7 @@ void KFilePermissionsPropsPlugin::applyChanges() } } -void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job ) +void KFilePermissionsPropsPlugin::slotChmodResult( TDEIO::Job * job ) { kdDebug(250) << "KFilePermissionsPropsPlugin::slotChmodResult" << endl; if (job->error()) @@ -3042,8 +3042,8 @@ void KDevicePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize, d->m_freeSpaceLabel->setText( // xgettext:no-c-format -- Don't warn about translating the %1 out of %2 part. i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)") - .arg(KIO::convertSizeFromKB(kBAvail)) - .arg(KIO::convertSizeFromKB(kBSize)) + .arg(TDEIO::convertSizeFromKB(kBAvail)) + .arg(TDEIO::convertSizeFromKB(kBSize)) .arg( 100 - (int)(100.0 * kBAvail / kBSize) )); d->m_freeSpaceBar->setProgress(percUsed, 100); @@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index d6a8223dd..df814f7d4 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -48,7 +48,7 @@ class TQComboBox; #define KPropsPage KPropsDlgPlugin -namespace KIO { class Job; } +namespace TDEIO { class Job; } /** * The main properties dialog class. @@ -142,7 +142,7 @@ public: * @param name is the internal name. * @param modal tells the dialog whether it should be modal. * IMPORTANT: This constructor, together with modal=true, leads to a grave - * display bug (due to KIO::stat() being run before the dialog has all the + * display bug (due to TDEIO::stat() being run before the dialog has all the * necessary information). Do not use this combination for now. * For local files with a known mimetype, simply create a KFileItem and pass * it to the other constructor. @@ -412,7 +412,7 @@ private: TQPtrList m_pageList; private slots: - void slotStatResult( KIO::Job * ); // No longer used + void slotStatResult( TDEIO::Job * ); // No longer used protected: virtual void virtual_hook( int id, void* data ); private: @@ -523,10 +523,10 @@ public: protected slots: void slotEditFileType(); - void slotCopyFinished( KIO::Job * ); - void slotFileRenamed( KIO::Job *, const KURL &, const KURL & ); + void slotCopyFinished( TDEIO::Job * ); + void slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ); void slotDirSizeUpdate(); - void slotDirSizeFinished( KIO::Job * ); + void slotDirSizeFinished( TDEIO::Job * ); void slotFoundMountPoint( const TQString& mp, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail ); void slotSizeStop(); @@ -600,7 +600,7 @@ public: private slots: - void slotChmodResult( KIO::Job * ); + void slotChmodResult( TDEIO::Job * ); void slotShowAdvancedPermissions(); private: diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 609668373..6f4a01f3b 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -32,7 +32,7 @@ #define MAX_DIR_HISTORY 3 -static void recentdirs_done(KConfig *config) +static void recentdirs_done(TDEConfig *config) { if (config == TDEGlobal::config()) { @@ -44,9 +44,9 @@ static void recentdirs_done(KConfig *config) } } -static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly) +static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly) { - KConfig *config; + TDEConfig *config; if ((key.length() < 2) || (key[0] != ':')) key = ":default"; if (key[1] == ':') @@ -87,7 +87,7 @@ void KRecentDirs::add(const TQString &fileClass, const TQString &directory) { TQString key = fileClass; TQStringList result; - KConfig *config = recentdirs_readList(key, result, false); + TDEConfig *config = recentdirs_readList(key, result, false); // make sure the dir is first in history result.remove(directory); result.prepend(directory); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index d91e7551f..1ec4a98c8 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -86,7 +86,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQString oldGrp = config->group(); config->setGroup(TQString::fromLatin1("RecentDocuments")); bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); @@ -169,8 +169,8 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 1d2cf1547..95f30ee24 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -577,16 +577,16 @@ KURL KURLBar::currentURL() const return item ? item->url() : KURL(); } -void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) +void KURLBar::readConfig( TDEConfig *appConfig, const TQString& itemGroup ) { m_isImmutable = appConfig->groupIsImmutable( itemGroup ); - KConfigGroupSaver cs( appConfig, itemGroup ); + TDEConfigGroupSaver cs( appConfig, itemGroup ); d->defaultIconSize = m_iconSize; m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize ); if ( m_useGlobal ) { // read global items - KConfig *globalConfig = TDEGlobal::config(); - KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); + TDEConfig *globalConfig = TDEGlobal::config(); + TDEConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); int num = globalConfig->readNumEntry( "Number of Entries" ); for ( int i = 0; i < num; i++ ) { readItem( i, globalConfig, false ); @@ -600,7 +600,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) } } -void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) +void KURLBar::readItem( int i, TDEConfig *config, bool applicationLocal ) { TQString number = TQString::number( i ); KURL url = KURL::fromPathOrURL( config->readPathEntry( TQString("URL_") + number )); @@ -610,9 +610,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) TQString description = config->readEntry( TQString("Description_") + number ); if (description.isEmpty() && url.protocol()=="beagle") { - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; const KURL kurl("beagle:?beagled-status"); - if (!KIO::NetAccess::stat(kurl, uds)) + if (!TDEIO::NetAccess::stat(kurl, uds)) return; description = i18n("Desktop Search"); @@ -626,9 +626,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal ) config->readNumEntry( TQString("IconGroup_") + number )) ); } -void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup ) +void KURLBar::writeConfig( TDEConfig *config, const TQString& itemGroup ) { - KConfigGroupSaver cs1( config, itemGroup ); + TDEConfigGroupSaver cs1( config, itemGroup ); if(!config->hasDefault("Speedbar IconSize") && m_iconSize == d->defaultIconSize ) config->revertToDefault("Speedbar IconSize"); else @@ -685,7 +685,7 @@ void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup ) m_isModified = false; } -void KURLBar::writeItem( KURLBarItem *item, int i, KConfig *config, +void KURLBar::writeItem( KURLBarItem *item, int i, TDEConfig *config, bool global ) { if ( !item->isPersistent() ) diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 29a73ff34..df9d15790 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -28,7 +28,7 @@ #include #include -class KConfig; +class TDEConfig; class KURLBar; /** @@ -215,7 +215,7 @@ class KURLBarListBox; * read and write the configuration of all the entries. It can differentiate * between global and local entries -- global entries will be saved in the * global configuration (kdeglobals), while local entries will be saved in - * your application's KConfig object. + * your application's TDEConfig object. * * Due to the configurability, you usually only insert some default entries * once and then solely use the read and writeConfig methods to preserve the @@ -331,27 +331,27 @@ public: * inside the group @p itemGroup. All items in there will be restored. * The reading of every item is delegated to the readItem() method. */ - virtual void readConfig( KConfig *config, const TQString& itemGroup ); + virtual void readConfig( TDEConfig *config, const TQString& itemGroup ); /** * Call this method to save the current configuration into @p config, * inside the group @p iconGroup. The writeItem() method is used * to save each item. */ - virtual void writeConfig( KConfig *config, const TQString& itemGroup ); + virtual void writeConfig( TDEConfig *config, const TQString& itemGroup ); /** * Called from readConfig() to read the i'th from @p config. * After reading a KURLBarItem is created and initialized with the read * values (as well as the given @p applicationLocal). */ - virtual void readItem( int i, KConfig *config, bool applicationLocal ); + virtual void readItem( int i, TDEConfig *config, bool applicationLocal ); /** * Called from writeConfig() to save the KURLBarItem @p item as the * i'th entry in the config-object. * @p global tell whether it should be saved in the global configuration - * or not (using KConfig::writeEntry( key, value, true, global ) ). + * or not (using TDEConfig::writeEntry( key, value, true, global ) ). */ - virtual void writeItem( KURLBarItem *item, int i, KConfig *, bool global ); + virtual void writeItem( KURLBarItem *item, int i, TDEConfig *, bool global ); /** * @returns the current KURLBarItem, or 0L if none. diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp index 9e00687ac..1fc6da496 100644 --- a/kio/kfile/tests/kcustommenueditortest.cpp +++ b/kio/kfile/tests/kcustommenueditortest.cpp @@ -8,7 +8,7 @@ int main(int argc, char** argv) KLocale::setMainCatalogue("tdelibs"); TDEApplication app(argc, argv, "KCustomMenuEditorTest"); KCustomMenuEditor editor(0); - KConfig *cfg = new KConfig("kdesktop_custom_menu2"); + TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2"); editor.load(cfg); if (editor.exec()) { -- cgit v1.2.1