Remove messageitem id

NathanW2 · NathanW2 · commit 65dfdf1fa4f8 · 2013-08-16T00:02:35.000+10:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -22,11 +22,9 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QTextEdit>
-#include <QUuid>
 
 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -268,11 +268,10 @@ QgsMessageBarItem* QgsMessageBar::pushWidget( QWidget *widget , QgsMessageBar::M`
`268`	`268`	`return item;`
`269`	`269`	`}`
`270`	`270`
`271`		`-QString QgsMessageBar::pushMessage( const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration )`
	`271`	`+void QgsMessageBar::pushMessage( const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration )`
`272`	`272`	`{`
`273`	`273`	`QgsMessageBarItem *item = new QgsMessageBarItem( title, text, level, duration );`
`274`	`274`	`pushItem( item );`
`275`		`- return item->id();`
`276`	`275`	`}`
`277`	`276`
`278`	`277`	`QgsMessageBarItem* QgsMessageBar::createMessage( const QString &text, QWidget *parent )`
`@@ -291,17 +290,6 @@ QgsMessageBarItem* QgsMessageBar::createMessage( QWidget widget, QWidget paren`
`291`	`290`	`return new QgsMessageBarItem( widget, INFO, 0, parent );`
`292`	`291`	`}`
`293`	`292`
`294`		`-QgsMessageBarItem* QgsMessageBar::itemAtId( QString uuid )`
`295`		`-{`
`296`		`- if ( mCurrentItem->id() == uuid )`
`297`		`- return mCurrentItem;`
`298`		`-`
`299`		`- foreach ( QgsMessageBarItem *item, mItems )`
`300`		`- if ( item->id() == uuid )`
`301`		`- return item;`
`302`		`- return 0;`
`303`		`-}`
`304`		`-`
`305`	`293`	`void QgsMessageBar::updateCountdown()`
`306`	`294`	`{`
`307`	`295`	`if ( !mCountdownTimer->isActive() )`