-rw-r--r-- | library/fileselector.h | 2 | ||||
-rw-r--r-- | library/qpedecoration_qws.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/library/fileselector.h b/library/fileselector.h index ef57626..f1c9eb1 100644 --- a/library/fileselector.h +++ b/library/fileselector.h | |||
@@ -98,16 +98,16 @@ private slots: | |||
98 | void cardMessage( const QCString &, const QByteArray &); | 98 | void cardMessage( const QCString &, const QByteArray &); |
99 | 99 | ||
100 | private: | 100 | private: |
101 | void updateView(); | 101 | void updateView(); |
102 | void updateWhatsThis(); | 102 | void updateWhatsThis(); |
103 | 103 | ||
104 | private: | 104 | private: |
105 | // RESOLVE please -zecke@handhelds.org | 105 | // RESOLVE please -zecke@handhelds.org |
106 | const DocLnk *selected(); // use selectedDocument() that's no luckily no compiler is putting the access into the symbol name | 106 | const DocLnk *selected(); // use selectedDocument() luckily no compiler is putting the access into the symbol name |
107 | FileSelectorView *view; | 107 | FileSelectorView *view; |
108 | QString filter; | 108 | QString filter; |
109 | QToolButton *buttonNew, *buttonClose; | 109 | QToolButton *buttonNew, *buttonClose; |
110 | FileSelectorPrivate *d; | 110 | FileSelectorPrivate *d; |
111 | }; | 111 | }; |
112 | 112 | ||
113 | #endif | 113 | #endif |
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index c2eb751..708dd23 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -102,18 +102,17 @@ public: | |||
102 | bool needsOk() { | 102 | bool needsOk() { |
103 | return (getWState() & WState_Reserved1 ) || | 103 | return (getWState() & WState_Reserved1 ) || |
104 | (inherits( "QDialog" ) && !inherits( "QMessageBox" ) ); | 104 | (inherits( "QDialog" ) && !inherits( "QMessageBox" ) ); |
105 | } | 105 | } |
106 | }; | 106 | }; |
107 | 107 | ||
108 | static QImage scaleButton( const QImage &img, int height ) | 108 | static QImage scaleButton( const QImage &img, int height ) |
109 | { | 109 | { |
110 | qWarning("Height %d %d", height, img.height() ); | 110 | if ( img.height() != 0 && img.height() != height ) { |
111 | if ( img.height()!=0 && img.height() != height ) { | ||
112 | return img.smoothScale( img.width()*height/img.height(), height ); | 111 | return img.smoothScale( img.width()*height/img.height(), height ); |
113 | } else { | 112 | } else { |
114 | return img; | 113 | return img; |
115 | } | 114 | } |
116 | } | 115 | } |
117 | 116 | ||
118 | class TLWidget : public QWidget | 117 | class TLWidget : public QWidget |
119 | { | 118 | { |