From e58c536dd1b55adc2bb733895ae571f860f88a5e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 9 Feb 2020 19:59:23 +0900 Subject: Removed beagle related code. Signed-off-by: Michele Calgaro (cherry picked from commit e5256a1bd6b1ee6eb909041c7fecc01d3d6d4be6) --- kio/kfile/kfiledialog.cpp | 6 ------ kio/kfile/kurlbar.cpp | 9 --------- kio/kio/netaccess.cpp | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) (limited to 'kio') diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index bc728acf7..6dbcd1fa9 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1171,12 +1171,6 @@ void KFileDialog::urlEntered(const KURL& url) d->pathCombo->setURL( url ); } - if (url.protocol()=="beagle" && url.path()=="/") { - d->pathCombo->setEditText("beagle:/<"+i18n("search term")+">"); - d->pathCombo->lineEdit()->setSelection(8,255); - d->pathCombo->setFocus(); - } - locationEdit->blockSignals( true ); locationEdit->setCurrentItem( 0 ); if ( d->keepLocation ) diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 7102b1b64..55a882edc 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -611,15 +611,6 @@ 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; - const KURL kurl("beagle:?beagled-status"); - if (!KIO::NetAccess::stat(kurl, uds)) - return; - - description = i18n("Desktop Search"); - } - insertItem( url, description, applicationLocal, diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index e6c3d655b..38fed9b27 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -337,7 +337,7 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, TQWidget* window ) { bJobOK = true; // success unless further error occurs - KIO::StatJob * job = KIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") ); + KIO::StatJob * job = KIO::stat( url, !url.isLocalFile() ); job->setWindow (window); job->setDetails( details ); job->setSide( source ); -- cgit v1.2.1