← Back to branch summary

~ubuntu-branches/ubuntu/wily/kdebase/wily

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-25 16:00:47 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20101125160047-bsycodsp50o8su5s
Tags: 4:4.5.80-0ubuntu1
* New upstream beta release
* Drop kubuntu_06_simple_aboutpage.diff, didn't apply and no point
  keeping a distro patch to an app we don't ship by default
* Drop kubuntu_23_konqueror_spinner_in_toolbar.diff now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/konqueror/src/konqframe.h
60
60
class KONQ_TESTS_EXPORT KonqFrameBase
61
61
{
62
62
 public:
63
 
  enum Option {
64
 
     None = 0x0,
65
 
     saveURLs = 0x1,
66
 
     saveHistoryItems = 0x02
67
 
  };
68
 
  Q_DECLARE_FLAGS(Options, Option)
 
63
    enum Option {
 
64
        None = 0x0,
 
65
        saveURLs = 0x01, // TODO rename to SaveUrls
 
66
        saveHistoryItems = 0x02 // TODO rename to SaveHistoryItems
 
67
    };
 
68
    Q_DECLARE_FLAGS(Options, Option)
69
69
 
70
70
  enum FrameType { View, Tabs, ContainerBase, Container, MainWindow };
71
71
 
187
187
   */
188
188
  void slotRemoveView();
189
189
 
190
 
protected:
191
 
  virtual void paintEvent( QPaintEvent* );
192
 
 
193
190
private:
194
191
  QVBoxLayout *m_pLayout;
195
192
  QPointer<KonqView> m_pView;