From a6a8334991b326d19f0d093eb78e6db41014645a Mon Sep 17 00:00:00 2001
From: Johannes Sixt <j6t@kdbg.org>
Date: Mon, 10 Nov 2008 22:34:34 +0100
Subject: [PATCH] Remove the line number display from the status bar.

We now have the line numbers in the source window itself.
---
 kdbg/commandids.h   |  1 -
 kdbg/dbgmainwnd.cpp | 23 -----------------------
 kdbg/dbgmainwnd.h   |  4 ----
 kdbg/sourcewnd.cpp  |  2 --
 kdbg/sourcewnd.h    |  1 -
 kdbg/winstack.cpp   |  1 -
 kdbg/winstack.h     |  1 -
 7 files changed, 33 deletions(-)

diff --git a/kdbg/commandids.h b/kdbg/commandids.h
index 4904716..a1ca0e2 100644
--- a/kdbg/commandids.h
+++ b/kdbg/commandids.h
@@ -10,5 +10,4 @@
 #define ID_STATUS_MSG 191
 #define ID_STATUS_BUSY 192
 #define ID_STATUS_ACTIVE 193
-#define ID_STATUS_LINENO 194
 #endif // COMMANDIDS_H
diff --git a/kdbg/dbgmainwnd.cpp b/kdbg/dbgmainwnd.cpp
index 54cc8c2..1de4a03 100644
--- a/kdbg/dbgmainwnd.cpp
+++ b/kdbg/dbgmainwnd.cpp
@@ -121,7 +121,6 @@ DebuggerMainWnd::DebuggerMainWnd(const char* name) :
 
     // file/line updates
     connect(m_filesWindow, SIGNAL(fileChanged()), SLOT(slotFileChanged()));
-    connect(m_filesWindow, SIGNAL(lineChanged()), SLOT(slotLineChanged()));
 
     // connect breakpoint table
     connect(m_bpTable, SIGNAL(activateFileLine(const QString&,int,const DbgAddr&)),
@@ -323,7 +322,6 @@ void DebuggerMainWnd::initToolbar()
     KStatusBar* statusbar = statusBar();
     statusbar->insertItem(m_statusActive, ID_STATUS_ACTIVE);
     m_lastActiveStatusText = m_statusActive;
-    statusbar->insertItem(i18n("Line 00000"), ID_STATUS_LINENO);
     statusbar->insertItem("", ID_STATUS_MSG);	/* message pane */
 
     // reserve some translations
@@ -495,7 +493,6 @@ void DebuggerMainWnd::updateUI()
 	statusBar()->changeItem(newStatus, ID_STATUS_ACTIVE);
 	m_lastActiveStatusText = newStatus;
     }
-    // line number is updated in slotLineChanged
 }
 
 void DebuggerMainWnd::dockUpdateHelper(QString action, QWidget* w)
@@ -544,7 +541,6 @@ void DebuggerMainWnd::slotFileChanged()
     QString file;
     int line;
     bool anyWindows = m_filesWindow->activeLine(file, line);
-    updateLineStatus(anyWindows ? line : -1);
     if (anyWindows) {
 	caption += " (";
 	caption += file;
@@ -553,14 +549,6 @@ void DebuggerMainWnd::slotFileChanged()
     setCaption(caption);
 }
 
-void DebuggerMainWnd::slotLineChanged()
-{
-    QString file;
-    int line;
-    bool anyWindows = m_filesWindow->activeLine(file, line);
-    updateLineStatus(anyWindows ? line : -1);
-}
-
 void DebuggerMainWnd::slotNewFileLoaded()
 {
     // updates program counter in the new file
@@ -568,17 +556,6 @@ void DebuggerMainWnd::slotNewFileLoaded()
 	m_filesWindow->updateLineItems(m_debugger);
 }
 
-void DebuggerMainWnd::updateLineStatus(int lineNo)
-{
-    if (lineNo < 0) {
-	statusBar()->changeItem("", ID_STATUS_LINENO);
-    } else {
-	QString strLine;
-	strLine.sprintf(i18n("Line %d"), lineNo + 1);
-	statusBar()->changeItem(strLine, ID_STATUS_LINENO);
-    }
-}
-
 KDockWidget* DebuggerMainWnd::dockParent(QWidget* w)
 {
     while ((w = w->parentWidget()) != 0) {
diff --git a/kdbg/dbgmainwnd.h b/kdbg/dbgmainwnd.h
index 0c72b0c..bfb8013 100644
--- a/kdbg/dbgmainwnd.h
+++ b/kdbg/dbgmainwnd.h
@@ -38,9 +38,6 @@ protected:
     void saveSettings(KConfig*);
     void restoreSettings(KConfig*);
 
-    // statusbar texts
-    void updateLineStatus(int lineNo);	/* zero-based line number */
-
     void initToolbar();
     void initKAction();
 
@@ -85,7 +82,6 @@ public slots:
     virtual void updateUI();
     virtual void updateLineItems();
     void slotFileChanged();
-    void slotLineChanged();
     void slotAddWatch();
     void slotAddWatch(const QString& text);
     void slotNewFileLoaded();
diff --git a/kdbg/sourcewnd.cpp b/kdbg/sourcewnd.cpp
index d636c87..c554d6e 100644
--- a/kdbg/sourcewnd.cpp
+++ b/kdbg/sourcewnd.cpp
@@ -735,8 +735,6 @@ void SourceWindow::cursorChanged(int row)
 	clearParagraphBackground(m_curRow);
     m_curRow = row;
     setParagraphBackgroundColor(row, colorGroup().background());
-
-    emit lineChanged();
 }
 
 /*
diff --git a/kdbg/sourcewnd.h b/kdbg/sourcewnd.h
index fcd8347..7aa091a 100644
--- a/kdbg/sourcewnd.h
+++ b/kdbg/sourcewnd.h
@@ -73,7 +73,6 @@ signals:
     void disassemble(const QString&, int);
     void expanded(int lineNo);		/* source lineNo has been expanded */
     void collapsed(int lineNo);		/* source lineNo has been collapsed */
-    void lineChanged();
 public slots:
     void setTabWidth(int numChars);
     void cursorChanged(int row);
diff --git a/kdbg/winstack.cpp b/kdbg/winstack.cpp
index 3bf81d2..6723900 100644
--- a/kdbg/winstack.cpp
+++ b/kdbg/winstack.cpp
@@ -125,7 +125,6 @@ bool WinStack::activatePath(QString pathName, int lineNo, const DbgAddr& address
 	}
 
 	m_fileList.insertAt(0, fw);
-	connect(fw, SIGNAL(lineChanged()),SIGNAL(lineChanged()));
 	connect(fw, SIGNAL(clickedLeft(const QString&,int,const DbgAddr&,bool)),
 		SIGNAL(toggleBreak(const QString&,int,const DbgAddr&,bool)));
 	connect(fw, SIGNAL(clickedMid(const QString&,int,const DbgAddr&)),
diff --git a/kdbg/winstack.h b/kdbg/winstack.h
index 065de3c..416beca 100644
--- a/kdbg/winstack.h
+++ b/kdbg/winstack.h
@@ -93,7 +93,6 @@ public:
 
 signals:
     void fileChanged();
-    void lineChanged();
     void toggleBreak(const QString&, int, const DbgAddr&, bool);
     void enadisBreak(const QString&, int, const DbgAddr&);
     void newFileLoaded();
-- 
2.11.4.GIT