← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-workspace/precise-security

« back to all changes in this revision

Viewing changes to kstyles/oxygen/oxygenstyle.h

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Scott Kitterman, Jonathan Riddell
  • Date: 2012-09-07 18:06:44 UTC
  • mfrom: (0.1.1) (1.1.14)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: package-import@ubuntu.com-20120907180644-ye0r2bakv7nsd4tl
Tags: 4:4.8.5-0ubuntu0.1
https://launchpad.net/bugs/1047417
[ Scott Kitterman ]
* New upstream bugfix release (LP: #1047417)
   - Drop patches previously cherrypicked from upstream:
      Remove_second_invisible_ProcessTable_widget.patch
      Fix_regression_that_you_couldnt_add_new_beams.patch
      Prevent_user_from_hiding_all_columns.patch
      observe_polkit_privileges_with_CanSuspend_CanResume.diff

[ Jonathan Riddell ]
* Add kde-workspace_4.8.5.orig-ksplash.tar.gz with ariya theme
  which was missed from tar by upsteram
* Add kubuntu_remove_horos_ksplash_theme.diff to remove horos theme

Show diffs side-by-side

added added

removed removed

Lines of Context:
kstyles/oxygen/oxygenstyle.h
596
596
 
597
597
        //! true if widget is child of KTextEdit
598
598
        bool isKTextEditFrame( const QWidget* widget ) const
599
 
        { return ( widget && widget->parentWidget() && widget->parentWidget()->inherits( "KTextEditor::View" ) ); }
 
599
        { return ( widget && widget->parentWidget() && qobject_cast<const QFrame*>( widget ) && widget->parentWidget()->inherits( "KTextEditor::View" ) ); }
600
600
 
601
601
        //! adjust rect based on provided margins
602
602
        QRect insideMargin( const QRect& r, int main, int left = 0, int top = 0, int right = 0, int bottom = 0 ) const