From 65dfdf1fa4f877be12de008fe590d56fc21ebaea Mon Sep 17 00:00:00 2001 From: Nathan Woodrow Date: Fri, 16 Aug 2013 00:00:04 +1000 Subject: [PATCH] Remove messageitem id --- python/gui/qgsmessagebar.sip | 7 ++----- python/gui/qgsmessagebaritem.sip | 3 --- src/gui/qgsmessagebar.cpp | 14 +------------- src/gui/qgsmessagebar.h | 7 ++----- src/gui/qgsmessagebaritem.cpp | 5 ----- src/gui/qgsmessagebaritem.h | 4 ---- 6 files changed, 5 insertions(+), 35 deletions(-) diff --git a/python/gui/qgsmessagebar.sip b/python/gui/qgsmessagebar.sip index 5764051402a..9c23e3ee942 100644 --- a/python/gui/qgsmessagebar.sip +++ b/python/gui/qgsmessagebar.sip @@ -45,12 +45,9 @@ class QgsMessageBar: QFrame static QgsMessageBarItem* createMessage( QWidget *widget, QWidget *parent = 0 ) /Factory/; //! convenience method for pushing a non-widget-based message to the bar - QString pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ); + void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ); //! convenience method for pushing a non-widget-based message with title to the bar - QString pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 ); - - //! return the item for given uuid if the item still exists, 0 otherwise - QgsMessageBarItem* itemAtId( QString uuid ); + void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 ); signals: //! emitted when a message widget is added to the bar diff --git a/python/gui/qgsmessagebaritem.sip b/python/gui/qgsmessagebaritem.sip index 33bb0b65caa..50a33fc729f 100644 --- a/python/gui/qgsmessagebaritem.sip +++ b/python/gui/qgsmessagebaritem.sip @@ -32,9 +32,6 @@ class QgsMessageBarItem: QWidget //! returns the duration in second of the message int duration(); - - //! get the uuid of this message - QString id(); //! returns the level QgsMessageBar::MessageLevel level(); diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp index f9826bbe786..5d25bc17d2b 100644 --- a/src/gui/qgsmessagebar.cpp +++ b/src/gui/qgsmessagebar.cpp @@ -268,11 +268,10 @@ QgsMessageBarItem* QgsMessageBar::pushWidget( QWidget *widget , QgsMessageBar::M return item; } -QString QgsMessageBar::pushMessage( const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration ) +void QgsMessageBar::pushMessage( const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration ) { QgsMessageBarItem *item = new QgsMessageBarItem( title, text, level, duration ); pushItem( item ); - return item->id(); } QgsMessageBarItem* QgsMessageBar::createMessage( const QString &text, QWidget *parent ) @@ -291,17 +290,6 @@ QgsMessageBarItem* QgsMessageBar::createMessage( QWidget *widget, QWidget *paren return new QgsMessageBarItem( widget, INFO, 0, parent ); } -QgsMessageBarItem* QgsMessageBar::itemAtId( QString uuid ) -{ - if ( mCurrentItem->id() == uuid ) - return mCurrentItem; - - foreach ( QgsMessageBarItem *item, mItems ) - if ( item->id() == uuid ) - return item; - return 0; -} - void QgsMessageBar::updateCountdown() { if ( !mCountdownTimer->isActive() ) diff --git a/src/gui/qgsmessagebar.h b/src/gui/qgsmessagebar.h index 8beec244915..f80a2ce1f71 100644 --- a/src/gui/qgsmessagebar.h +++ b/src/gui/qgsmessagebar.h @@ -84,12 +84,9 @@ class GUI_EXPORT QgsMessageBar: public QFrame static QgsMessageBarItem* createMessage( QWidget *widget, QWidget *parent = 0 ); //! convenience method for pushing a message to the bar - QString pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ) { return pushMessage( QString::null, text, level, duration ); } + void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ) { return pushMessage( QString::null, text, level, duration ); } //! convenience method for pushing a message with title to the bar - QString pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 ); - - //! return the item for given uuid if the item still exists, 0 otherwise - QgsMessageBarItem* itemAtId( QString uuid ); + void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 ); signals: //! emitted when a message widget is added to the bar diff --git a/src/gui/qgsmessagebaritem.cpp b/src/gui/qgsmessagebaritem.cpp index 0e7b514e878..1c62c9f97e2 100644 --- a/src/gui/qgsmessagebaritem.cpp +++ b/src/gui/qgsmessagebaritem.cpp @@ -22,11 +22,9 @@ #include #include #include -#include QgsMessageBarItem::QgsMessageBarItem( const QString &text, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) : QWidget( parent ) - , mUuid( QUuid::createUuid().toString() ) , mTitle( "" ) , mText( text ) , mLevel( level ) @@ -40,7 +38,6 @@ QgsMessageBarItem::QgsMessageBarItem( const QString &text, QgsMessageBar::Messag QgsMessageBarItem::QgsMessageBarItem(const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration , QWidget *parent ) : QWidget( parent ) - , mUuid( QUuid::createUuid().toString() ) , mTitle( title ) , mText( text ) , mLevel( level ) @@ -54,7 +51,6 @@ QgsMessageBarItem::QgsMessageBarItem(const QString &title, const QString &text, QgsMessageBarItem::QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) : QWidget( parent ) - , mUuid( QUuid::createUuid().toString() ) , mTitle( title ) , mText( text ) , mLevel( level ) @@ -68,7 +64,6 @@ QgsMessageBarItem::QgsMessageBarItem( const QString &title, const QString &text, QgsMessageBarItem::QgsMessageBarItem( QWidget *widget, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) : QWidget( parent ) - , mUuid( QUuid::createUuid().toString() ) , mTitle( "" ) , mText( "" ) , mLevel( level ) diff --git a/src/gui/qgsmessagebaritem.h b/src/gui/qgsmessagebaritem.h index 046662edabb..9cf0ed835e0 100644 --- a/src/gui/qgsmessagebaritem.h +++ b/src/gui/qgsmessagebaritem.h @@ -59,9 +59,6 @@ class GUI_EXPORT QgsMessageBarItem : public QWidget //! returns the duration in second of the message int duration() const { return mDuration; } - //! get the uuid of this message - QString id() { return mUuid; } - //! returns the level QgsMessageBar::MessageLevel level() { return mLevel; } @@ -76,7 +73,6 @@ class GUI_EXPORT QgsMessageBarItem : public QWidget private: void writeContent(); - QString mUuid; QString mTitle; QString mText; QgsMessageBar::MessageLevel mLevel;