Skip to content

Commit 65dfdf1

Browse files
committedAug 15, 2013
Remove messageitem id
1 parent 05a41e3 commit 65dfdf1

File tree

6 files changed

+5
-35
lines changed

6 files changed

+5
-35
lines changed
 

‎python/gui/qgsmessagebar.sip

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ class QgsMessageBar: QFrame
4545
static QgsMessageBarItem* createMessage( QWidget *widget, QWidget *parent = 0 ) /Factory/;
4646

4747
//! convenience method for pushing a non-widget-based message to the bar
48-
QString pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 );
48+
void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 );
4949
//! convenience method for pushing a non-widget-based message with title to the bar
50-
QString pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 );
51-
52-
//! return the item for given uuid if the item still exists, 0 otherwise
53-
QgsMessageBarItem* itemAtId( QString uuid );
50+
void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 );
5451

5552
signals:
5653
//! emitted when a message widget is added to the bar

‎python/gui/qgsmessagebaritem.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ class QgsMessageBarItem: QWidget
3232

3333
//! returns the duration in second of the message
3434
int duration();
35-
36-
//! get the uuid of this message
37-
QString id();
3835

3936
//! returns the level
4037
QgsMessageBar::MessageLevel level();

‎src/gui/qgsmessagebar.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,10 @@ QgsMessageBarItem* QgsMessageBar::pushWidget( QWidget *widget , QgsMessageBar::M
268268
return item;
269269
}
270270

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 )
272272
{
273273
QgsMessageBarItem *item = new QgsMessageBarItem( title, text, level, duration );
274274
pushItem( item );
275-
return item->id();
276275
}
277276

278277
QgsMessageBarItem* QgsMessageBar::createMessage( const QString &text, QWidget *parent )
@@ -291,17 +290,6 @@ QgsMessageBarItem* QgsMessageBar::createMessage( QWidget *widget, QWidget *paren
291290
return new QgsMessageBarItem( widget, INFO, 0, parent );
292291
}
293292

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-
305293
void QgsMessageBar::updateCountdown()
306294
{
307295
if ( !mCountdownTimer->isActive() )

‎src/gui/qgsmessagebar.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,9 @@ class GUI_EXPORT QgsMessageBar: public QFrame
8484
static QgsMessageBarItem* createMessage( QWidget *widget, QWidget *parent = 0 );
8585

8686
//! convenience method for pushing a message to the bar
87-
QString pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ) { return pushMessage( QString::null, text, level, duration ); }
87+
void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 ) { return pushMessage( QString::null, text, level, duration ); }
8888
//! convenience method for pushing a message with title to the bar
89-
QString pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 );
90-
91-
//! return the item for given uuid if the item still exists, 0 otherwise
92-
QgsMessageBarItem* itemAtId( QString uuid );
89+
void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 0 );
9390

9491
signals:
9592
//! emitted when a message widget is added to the bar

‎src/gui/qgsmessagebaritem.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
#include <QHBoxLayout>
2323
#include <QLabel>
2424
#include <QTextEdit>
25-
#include <QUuid>
2625

2726
QgsMessageBarItem::QgsMessageBarItem( const QString &text, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) :
2827
QWidget( parent )
29-
, mUuid( QUuid::createUuid().toString() )
3028
, mTitle( "" )
3129
, mText( text )
3230
, mLevel( level )
@@ -40,7 +38,6 @@ QgsMessageBarItem::QgsMessageBarItem( const QString &text, QgsMessageBar::Messag
4038

4139
QgsMessageBarItem::QgsMessageBarItem(const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration , QWidget *parent ) :
4240
QWidget( parent )
43-
, mUuid( QUuid::createUuid().toString() )
4441
, mTitle( title )
4542
, mText( text )
4643
, mLevel( level )
@@ -54,7 +51,6 @@ QgsMessageBarItem::QgsMessageBarItem(const QString &title, const QString &text,
5451

5552
QgsMessageBarItem::QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) :
5653
QWidget( parent )
57-
, mUuid( QUuid::createUuid().toString() )
5854
, mTitle( title )
5955
, mText( text )
6056
, mLevel( level )
@@ -68,7 +64,6 @@ QgsMessageBarItem::QgsMessageBarItem( const QString &title, const QString &text,
6864

6965
QgsMessageBarItem::QgsMessageBarItem( QWidget *widget, QgsMessageBar::MessageLevel level, int duration, QWidget *parent ) :
7066
QWidget( parent )
71-
, mUuid( QUuid::createUuid().toString() )
7267
, mTitle( "" )
7368
, mText( "" )
7469
, mLevel( level )

‎src/gui/qgsmessagebaritem.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ class GUI_EXPORT QgsMessageBarItem : public QWidget
5959
//! returns the duration in second of the message
6060
int duration() const { return mDuration; }
6161

62-
//! get the uuid of this message
63-
QString id() { return mUuid; }
64-
6562
//! returns the level
6663
QgsMessageBar::MessageLevel level() { return mLevel; }
6764

@@ -76,7 +73,6 @@ class GUI_EXPORT QgsMessageBarItem : public QWidget
7673
private:
7774
void writeContent();
7875

79-
QString mUuid;
8076
QString mTitle;
8177
QString mText;
8278
QgsMessageBar::MessageLevel mLevel;

0 commit comments

Comments
 (0)
Please sign in to comment.