X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d27b30a66ae9038eadf81cc06dae1b002bef7625..85bc196887fbed01187e3830cd28c2500cb01cb2:/src/protocolcombo.cpp diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp index 3bc818706..729102973 100644 --- a/src/protocolcombo.cpp +++ b/src/protocolcombo.cpp @@ -14,10 +14,10 @@ * 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 +#include #include #include @@ -34,7 +34,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent) qSort(m_protocols); QStringList::iterator it = m_protocols.begin(); QStringList::iterator itEnd = m_protocols.end(); - Q3PopupMenu* menu = new Q3PopupMenu(this); + QMenu* menu = new QMenu(this); while (it != itEnd) { //kDebug() << "info for " << *it << " " @@ -42,6 +42,9 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent) //TODO: wow this is ugly. or .. is it? ;) we need a way to determine // if a protocol is appropriate for use in a file manager. hum! //if (KProtocolInfo::capabilities(*it).findIndex("filemanager") == -1) + + // DF: why not just supportsListing? + if (KProtocolInfo::protocolClass(*it) == ":" || !KProtocolManager::supportsWriting(*it)) { @@ -70,7 +73,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); }