← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/kdebase/intrepid-backports

« back to all changes in this revision

Viewing changes to apps/konqueror/src/konqmainwindow.h

  • Committer: Bazaar Package Importer
  • Author(s): Steve Stalcup
  • Date: 2008-10-31 10:55:17 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20081031105517-62s6t4f2c8j420dy
Tags: 4:4.1.3-0ubuntu1~intrepid1
https://launchpad.net/bugs/279190
https://launchpad.net/bugs/289832
* New upstream release (LP: #279190, #289832)
* removed following patches completely from debian/patches
  - kubuntu_05_konsole_resize.diff
  - kubuntu_06_fix_cut_copy_context_menu.diff
  - kubuntu_07_fix_KDE_169103_dolphin_crash.diff
  - kubuntu_900_improve_kfind_performance.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/konqueror/src/konqmainwindow.h
128
128
               bool trustedSource = false); // trustedSource should be part of KonqOpenURLRequest, probably
129
129
 
130
130
public:
131
 
  /**
132
 
   * Called by openUrl when it knows the service type (either directly,
133
 
   * or using KonqRun)
134
 
   */
135
 
  bool openView( QString serviceType, const KUrl &_url, KonqView *childView,
136
 
                 const KonqOpenURLRequest & req = KonqOpenURLRequest::null );
 
131
    /**
 
132
     * Called by openUrl when it knows the mime type (either directly,
 
133
     * or using KonqRun).
 
134
     * \param mimeType the mimetype of the URL to open. Always set.
 
135
     * \param url the URL to open.
 
136
     * \param childView the view in which to open the URL. Can be 0, in which
 
137
     * case a new tab (or the very first view) will be created.
 
138
     */
 
139
    bool openView(QString mimeType, const KUrl& url, KonqView *childView,
 
140
                  const KonqOpenURLRequest & req = KonqOpenURLRequest::null);
137
141
 
138
142
 
139
143
  void abortLoading();