Reanimated drag & drop support again after introducing the DolphinController. It...

[dolphin.git] / src / protocolcombo.cpp

diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp
index f5f398ebcb6ee71de5c9ef34f60c744c9bb8c7e8..94f4e359c05cc8ea5ff0e2f3e30dae39eec2c289 100644 (file)
--- a/src/protocolcombo.cpp
+++ b/src/protocolcombo.cpp
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include <q3popupmenu.h>
@@ -27,8 +27,8 @@
 
 const static int customProtocolIndex = 0;
 
-ProtocolCombo::ProtocolCombo(const QString& protocol, URLNavigator* parent)
-    : URLNavigatorButton(-1, parent),
+ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
+    : UrlNavigatorButton(-1, parent),
       m_protocols(KProtocolInfo::protocols())
 {
     qSort(m_protocols);
@@ -48,7 +48,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, URLNavigator* parent)
         //kDebug() << "!!! removing " << *it << endl;
             QStringList::iterator tempIt = it;
             ++tempIt;
-            m_protocols.remove(it);
+            m_protocols.erase(it);
             it = tempIt;
         }
         else
@@ -70,7 +70,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, URLNavigator* parent)
     //menu->insertItems(m_protocols);
     connect(menu, SIGNAL(activated(int)), this, SLOT(setProtocol(int)));
     setText(protocol);
-    setPopup(menu);
+    setMenu(menu);
     setFlat(true);
 }