[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] debuggers/gdb: Revert "If code without debug symbols or file doesn't exist raise the"
From:       Vlas Puhov <vlas.puhov () mail ! ru>
Date:       2014-02-08 15:13:27
Message-ID: E1WC9ax-000754-Ib () scm ! kde ! org
[Download RAW message or body]

Git commit a1166d40841d70e76471734aa0b278271efce04a by Vlas Puhov.
Committed on 08/02/2014 at 14:55.
Pushed by vpuhov into branch 'master'.

Revert "If code without debug symbols or file doesn't exist raise the"

This reverts commit 2c33ab16bf88ce2893b95c72320a7b1caca6f4e2.

That commit brings more bad than good. As DisassembleWidget appers
whenever you attach to a program or edit breakpoints, which can
become very, very, very annoying.

M  +4    -6    debuggers/gdb/disassemblewidget.cpp
M  +2    -2    debuggers/gdb/disassemblewidget.h

http://commits.kde.org/kdevelop/a1166d40841d70e76471734aa0b278271efce04a

diff --git a/debuggers/gdb/disassemblewidget.cpp b/debuggers/gdb/disassemblewidget.cpp
index fbad2fc..91194ed 100644
--- a/debuggers/gdb/disassemblewidget.cpp
+++ b/debuggers/gdb/disassemblewidget.cpp
@@ -236,7 +236,7 @@ void DisassembleWidget::currentSessionChanged(KDevelop::IDebugSession* s)
     if (session) {
         connect(session, SIGNAL(showStepInSource(KUrl,int,QString)),
                 SLOT(slotShowStepInSource(KUrl,int,QString)));
-        connect(session,SIGNAL(showStepInDisassemble(QString)),SLOT(updateState(QString)));
+        connect(session,SIGNAL(showStepInDisassemble(QString)),SLOT(update(QString)));
     }
 }
 
@@ -296,7 +296,7 @@ void DisassembleWidget::slotActivate(bool activate)
 void DisassembleWidget::slotShowStepInSource(const KUrl&, int,
         const QString& currentAddress)
 {
-    updateState(currentAddress, false);
+    update(currentAddress);
 }
 
 void DisassembleWidget::updateExecutionAddressHandler(const GDBMI::ResultRecord& r)
@@ -425,11 +425,9 @@ void SelectAddrDialog::setAddress ( const QString& address )
      m_ui.comboBox->setCurrentItem ( address, true );
 }
 
-void DisassembleWidget::updateState(const QString &address, bool activate)
+void DisassembleWidget::update(const QString &address)
 {
-    if (activate) {
-        emit requestRaise();
-    } else if (!active_) {
+    if (!active_) {
         return;
     }
 
diff --git a/debuggers/gdb/disassemblewidget.h b/debuggers/gdb/disassemblewidget.h
index b919046..ccffc2f 100644
--- a/debuggers/gdb/disassemblewidget.h
+++ b/debuggers/gdb/disassemblewidget.h
@@ -118,8 +118,8 @@ public Q_SLOTS:
     void slotDeactivate();
     void slotShowStepInSource(const KUrl &fileName, int lineNum, const QString &address);
     void slotChangeAddress();
-    ///Disassembles code at @p address, updates registers and shows the widget if @p activate is true
-    void updateState(const QString &address, bool activate = true);
+    ///Disassembles code at @p address and updates registers
+    void update(const QString &address);
 
 private Q_SLOTS:
     void currentSessionChanged(KDevelop::IDebugSession* session);
[prev in list] [next in list] [prev in thread] [next in thread]