Merge branch 'opensearch'

Conflicts:
	src/CMakeLists.txt
	src/urlbar/urlresolver.cpp

1 files changed, 19 insertions, 1 deletions

diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index dcb4f76d..06a02b80 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -61,7 +61,8 @@ public:
     void deactivate();
 
     KUrl url();
-
+    virtual QString text();
+    
 public slots:
     virtual void nextItemSubChoice();
 
@@ -153,6 +154,7 @@ class SearchListItem : public ListItem
 
 public:
     explicit SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    QString text();
 
 public slots:
     virtual void nextItemSubChoice();
@@ -174,6 +176,22 @@ private:
 // -------------------------------------------------------------------------
 
 
+class SuggestionListItem : public ListItem
+{
+    Q_OBJECT
+
+public:
+    SuggestionListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    QString text();
+
+private:
+    QString m_text;
+};
+
+
+// -------------------------------------------------------------------------
+
+
 class PreviewListItem : public ListItem
 {
     Q_OBJECT