X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fec7ff9a096d288b66fce2699c7b8bc71f6fbbb..dc3e19744dedef4b185eb0becb00a28c74381c4c:/src/protocolcombo.cpp diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp index b40a73b5b..94f4e359c 100644 --- 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 @@ -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); }