[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/applets/webbrowser
From:       Marco Martin <notmart () gmail ! com>
Date:       2008-09-30 20:44:00
Message-ID: 1222807440.747318.5613.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866435 by mart:

wrap a bunch less stuff in the proxywidget


 M  +0 -30     historycombobox.cpp  
 M  +0 -13     historycombobox.h  
 M  +2 -2      webbrowser.cpp  


--- trunk/playground/base/plasma/applets/webbrowser/historycombobox.cpp #866434:866435
@@ -96,11 +96,6 @@
     return d->historyCombo->historyItems();
 }
 
-KPixmapProvider *HistoryComboBox::pixmapProvider() const
-{
-    return d->historyCombo->pixmapProvider();
-}
-
 bool HistoryComboBox::removeFromHistory(const QString &item)
 {
     return d->historyCombo->removeFromHistory(item);
@@ -111,46 +106,21 @@
     d->historyCombo->reset();
 }
 
-void HistoryComboBox::setHistoryItems(const QStringList &items, bool setCompletionList)
-{
-    d->historyCombo->setHistoryItems(items, setCompletionList);
-}
-
 void HistoryComboBox::setHistoryItems(const QStringList &items)
 {
     d->historyCombo->setHistoryItems(items);
 }
 
-void HistoryComboBox::setPixmapProvider(KPixmapProvider *prov)
-{
-     d->historyCombo->setPixmapProvider(prov);
-}
-
 QString HistoryComboBox::currentText() const
 {
     return d->historyCombo->currentText();
 }
 
-bool HistoryComboBox::containsString(const QString & text) const
-{
-    return d->historyCombo->contains(text);
-}
-
 void HistoryComboBox::insertUrl(int index, const KUrl &url)
 {
     d->historyCombo->insertUrl(index, url);
 }
 
-void HistoryComboBox::setCompletionObject(KCompletion *compObj, bool hsig)
-{
-    d->historyCombo->setCompletionObject(compObj, hsig);
-}
-
-KCompletion *HistoryComboBox::completionObject() const
-{
-    return d->historyCombo->completionObject();
-}
-
 void HistoryComboBox::setDuplicatesEnabled(bool enabled)
 {
     d->historyCombo->setDuplicatesEnabled(enabled);
--- trunk/playground/base/plasma/applets/webbrowser/historycombobox.h #866434:866435
@@ -65,17 +65,11 @@
     KHistoryComboBox* nativeWidget() const;
 
     QStringList historyItems() const;
-    KPixmapProvider *pixmapProvider() const;
     bool removeFromHistory(const QString &item);
     void reset();
-    void setHistoryItems(const QStringList &items, bool setCompletionList);
     void setHistoryItems(const QStringList &items);
-    void setPixmapProvider(KPixmapProvider *prov);
     QString currentText() const;
-    bool containsString(const QString & text) const;
     void insertUrl(int index, const KUrl &url);
-    void setCompletionObject(KCompletion *compObj, bool hsig=true);
-    KCompletion *completionObject() const;
     void setDuplicatesEnabled(bool enabled);
 
 public Q_SLOTS:
@@ -84,14 +78,7 @@
 Q_SIGNALS:
     void textChanged();
     void cleared();
-    void aboutToShowContextMenu(QMenu *p);
-    void completion(const QString &);
-    void completionModeChanged(KGlobalSettings::Completion);
-    void returnPressed(const QString &);
-    void returnPressed();
     void activated(int index);
-    void substringCompletion(const QString &);
-    void textRotation(KCompletionBase::KeyBindingType);
 
 protected:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
--- trunk/playground/base/plasma/applets/webbrowser/webbrowser.cpp #866434:866435
@@ -80,7 +80,7 @@
     m_historyCombo->setZValue(999);
     m_historyCombo->setDuplicatesEnabled(false);
     m_pixmapProvider = new KUrlPixmapProvider;
-    m_historyCombo->setPixmapProvider(m_pixmapProvider);
+    m_historyCombo->nativeWidget()->setPixmapProvider(m_pixmapProvider);
 
     m_toolbarLayout->addItem(m_historyCombo);
     m_go = addAction("go-jump-locationbar", m_toolbarLayout);
@@ -160,7 +160,7 @@
 
     //Autocompletion stuff
     m_completion = new KCompletion();
-    m_historyCombo->setCompletionObject(m_completion);
+    m_historyCombo->nativeWidget()->setCompletionObject(m_completion);
 
     QStringList list = cg.readEntry("History list", QStringList());
     m_historyCombo->setHistoryItems(list);
[prev in list] [next in list] [prev in thread] [next in thread]