vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Nov 30 21:04:26 2010 +0100| [8a7513fe6819e91b2887559f98ea24caca0aa994] | committer: Jean-Baptiste Kempf
Qt: SearchLineEdit: rename function to match Qt4.7 names > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a7513fe6819e91b2887559f98ea24caca0aa994 --- modules/gui/qt4/util/searchlineedit.cpp | 7 +++++-- modules/gui/qt4/util/searchlineedit.hpp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/util/searchlineedit.cpp b/modules/gui/qt4/util/searchlineedit.cpp index a398ccc..a042468 100644 --- a/modules/gui/qt4/util/searchlineedit.cpp +++ b/modules/gui/qt4/util/searchlineedit.cpp @@ -43,10 +43,10 @@ ClickLineEdit::ClickLineEdit( const QString &msg, QWidget *parent) : QLineEdit( parent ) { mDrawClickMsg = true; - setClickMessage( msg ); + setPlaceholderText( msg ); } -void ClickLineEdit::setClickMessage( const QString &msg ) +void ClickLineEdit::setPlaceholderText( const QString &msg ) { mClickMessage = msg; repaint(); @@ -100,6 +100,9 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev ) QLineEdit::focusOutEvent( ev ); } + + + SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent ) { clearButton = new QVLCFramelessButton( this ); diff --git a/modules/gui/qt4/util/searchlineedit.hpp b/modules/gui/qt4/util/searchlineedit.hpp index b17b7c5..b9773ca 100644 --- a/modules/gui/qt4/util/searchlineedit.hpp +++ b/modules/gui/qt4/util/searchlineedit.hpp @@ -39,10 +39,10 @@ class ClickLineEdit : public QLineEdit { Q_OBJECT - Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessage ) + Q_PROPERTY( QString clickMessage READ clickMessage WRITE setPlaceholderText ) public: ClickLineEdit( const QString &msg, QWidget *parent ); - void setClickMessage( const QString &msg ); + void setPlaceholderText( const QString &msg ); const QString& clickMessage() const { return mClickMessage; } virtual void setText( const QString& txt ); protected: _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
