[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeaddons/konq-plugins/searchbar
From: Pascal Létourneau <pascal.letourneau () kdemail ! net>
Date: 2005-11-16 1:35:08
Message-ID: 1132104908.111009.6738.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 480672 by pletourn:
Respect the user choice for the delimiter
Check for null pointer
M +19 -11 searchbar.cpp
--- trunk/KDE/kdeaddons/konq-plugins/searchbar/searchbar.cpp #480671:480672
@@ -109,6 +109,13 @@
m_searchCombo = 0L;
}
+QChar delimiter()
+{
+ KConfig config( "kuriikwsfilterrc", true, false );
+ config.setGroup( "General" );
+ return config.readNumEntry( "KeywordDelimiter", ':' );
+}
+
bool SearchBarPlugin::eventFilter(QObject *o, QEvent *e)
{
if( o==m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress )
@@ -210,15 +217,14 @@
list << "kurisearchfilter" << "kuriikwsfilter";
service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine));
- const QString searchProviderPrefix = \
*(service->property("Keys").toStringList().begin()) + ':';
- data.setData( searchProviderPrefix + search );
+ if ( service ) {
+ const QString searchProviderPrefix = \
*(service->property("Keys").toStringList().begin()) + delimiter(); + \
data.setData( searchProviderPrefix + search ); + }
- if(!KURIFilter::self()->filterURI(data, list))
+ if(!service || !KURIFilter::self()->filterURI(data, list))
{
- KConfig config( "kuriikwsfilterrc", true, false );
- config.setGroup( "General" );
- char deli = config.readNumEntry( "KeywordDelimiter", ':' );
- data.setData( QLatin1String( "google" ) + deli + search );
+ data.setData( QLatin1String( "google" ) + delimiter() + search );
KURIFilter::self()->filterURI( data, list );
}
@@ -264,10 +270,12 @@
list << "kurisearchfilter" << "kuriikwsfilter";
service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine));
- const QString searchProviderPrefix = \
*(service->property("Keys").toStringList().begin()) + ':';
- data.setData( searchProviderPrefix + "some keyword" );
+ if ( service ) {
+ const QString searchProviderPrefix = \
*(service->property("Keys").toStringList().begin()) + delimiter(); + \
data.setData( searchProviderPrefix + "some keyword" ); + }
- if(KURIFilter::self()->filterURI(data, list))
+ if(service && KURIFilter::self()->filterURI(data, list))
{
QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + \
".png"); if(iconPath.isEmpty())
@@ -323,7 +331,7 @@
{
continue;
}
- const QString searchProviderPrefix = \
*(service->property("Keys").toStringList().begin()) + ':'; + const QString \
searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + \
delimiter(); data.setData( searchProviderPrefix + "some keyword" );
if(KURIFilter::self()->filterURI(data, list))
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic