remove unused message log viewer flag (follows up followup followup 9…

…57f1ac)
qgis · Feb 16, 2015 · bca1560 · bca1560
1 parent ca86be7
commit bca1560
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/python/gui/qgsmessagelogviewer.sip b/python/gui/qgsmessagelogviewer.sip
@@ -1,5 +1,5 @@
 /** \ingroup gui
- * A generic message for displaying QGIS log messages.
+ * A generic dialog widget for displaying QGIS log messages.
  */
 class QgsMessageLogViewer: QDialog
 {
@@ -11,15 +11,6 @@ class QgsMessageLogViewer: QDialog
     QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageLogViewer();
 
-    //! @note added in 2.4
-    void setShowToolTips( bool enabled );
-    //! @note added in 2.4
-    bool showToolTips() const;
-
   public slots:
     void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
-
-  private:
-    void showEvent( QShowEvent * );
-    void hideEvent( QHideEvent * );
 };
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -651,7 +651,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   mLastMapToolMessage = 0;
 
   mLogViewer = new QgsMessageLogViewer( statusBar(), this );
-  mLogViewer->setShowToolTips( false );
 
   mLogDock = new QDockWidget( tr( "Log Messages" ), this );
   mLogDock->setObjectName( "MessageLog" );
@@ -838,8 +837,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 #ifdef ANDROID
   toggleFullScreen();
 #endif
-
-  mLogViewer->setShowToolTips( true );
 } // QgisApp ctor
 
 QgisApp::QgisApp()
@@ -1855,7 +1852,8 @@ void QgisApp::createStatusBar()
   mMessageButton = new QToolButton( statusBar() );
   mMessageButton->setAutoRaise( true );
   mMessageButton->setIcon( QgsApplication::getThemeIcon( "bubble.svg" ) );
-  mMessageButton->setText( tr( "Messages" ) );
+  mMessageButton->setToolTip( tr( "Messages" ) );
+  mMessageButton->setWhatsThis( tr( "Messages" ) );
   mMessageButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
   mMessageButton->setObjectName( "mMessageLogViewerButton" );
   mMessageButton->setMaximumHeight( mScaleLabel->height() );

diff --git a/src/gui/qgsmessagelogviewer.cpp b/src/gui/qgsmessagelogviewer.cpp
@@ -32,7 +32,6 @@
 
 QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent, Qt::WindowFlags fl )
     : QDialog( parent, fl )
-    , mShowToolTips( true )
 {
   Q_UNUSED( statusBar )
   setupUi( this );

diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h
@@ -38,17 +38,9 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
     QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageLogViewer();
 
-    //! @note added in 2.4
-    void setShowToolTips( bool enabled ) { mShowToolTips = enabled; }
-    //! @note added in 2.4
-    bool showToolTips() const { return mShowToolTips; }
-
   public slots:
     void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
 
-  private:
-    bool mShowToolTips;
-
   private slots:
     void closeTab( int index );
 };