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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkonsole=5D_src=3A_Remove_unused_code_for_Search_Bar?=
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2011-03-03 17:58:40
Message-ID: 20110303175840.E3444A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit 989ae9cc08502d1a0eca1a157603fc73fde48b25 by Kurt Hindenburg.
Committed on 03/03/2011 at 18:56.
Pushed by hindenburg into branch 'master'.

Remove unused code for Search Bar: Continue text.

Apparently at one time when the search looped around a continue label
was displayed.  The code hasn't been used lately (if ever) and I don't
see a reason for the label.

M  +0    -23   src/IncrementalSearchBar.cpp     
M  +0    -25   src/IncrementalSearchBar.h     

http://commits.kde.org/konsole/989ae9cc08502d1a0eca1a157603fc73fde48b25

diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp
index f3081b8..c75a20f 100644
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@@ -41,7 +41,6 @@ IncrementalSearchBar::IncrementalSearchBar(QWidget* parent)
     : QWidget(parent)
     , _foundMatch(false)
     , _searchEdit(0)
-    , _continueLabel(0)
     ,_caseSensitive(0)
     ,_regExpression(0)
     ,_highlightMatches(0)
@@ -102,9 +101,6 @@ IncrementalSearchBar::IncrementalSearchBar(QWidget* parent)
     optionsButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
     optionsButton->setToolTip( i18n("Display the options menu") );
 
-    QLabel* _continueLabel = new QLabel(this);
-    _continueLabel->setVisible(false);
-
     layout->addWidget(close);
     layout->addWidget(findLabel);
     layout->addWidget(_searchEdit);
@@ -134,7 +130,6 @@ IncrementalSearchBar::IncrementalSearchBar(QWidget* parent)
     connect(_highlightMatches, SIGNAL(toggled(bool)),
             this, SIGNAL(highlightMatchesToggled(bool)) );
 
-    layout->addWidget(_continueLabel);
     layout->addStretch();
 
     layout->setContentsMargins(4, 4, 4, 4);
@@ -198,24 +193,6 @@ void IncrementalSearchBar::setFoundMatch( bool match )
     }
 }
 
-void IncrementalSearchBar::setContinueFlag( Continue flag )
-{
-    if ( flag == ContinueFromTop )
-    {
-        _continueLabel->setText( i18n("Search reached bottom, continued from top.") );
-        _continueLabel->show();
-    } 
-    else if ( flag == ContinueFromBottom )
-    {
-        _continueLabel->setText( i18n("Search reached top, continued from bottom.") );
-        _continueLabel->show();
-    } 
-    else if ( flag == ClearContinue )
-    {
-        _continueLabel->hide();
-    }
-}
-
 void IncrementalSearchBar::clearLineEdit()
 {
     _searchEdit->setStyleSheet( QString() );
diff --git a/src/IncrementalSearchBar.h b/src/IncrementalSearchBar.h
index 8fccd43..c1fe0b4 100644
--- a/src/IncrementalSearchBar.h
+++ b/src/IncrementalSearchBar.h
@@ -59,22 +59,6 @@ class IncrementalSearchBar : public QWidget
 Q_OBJECT
 
 public:
-    enum Continue
-    {
-        /** 
-         * Indicates that the search has reached the bottom of the document and has been continued from
-         * the top 
-         */
-        ContinueFromTop,
-        /**
-         * Indicates that the search has reached the top of the document and has been continued from
-         * the bottom
-         */
-        ContinueFromBottom,
-
-        /** Clears the Continue flag */
-        ClearContinue
-    };
 
     /** 
      * This enum defines the options that can be checked.
@@ -110,14 +94,6 @@ public:
      */
     void setFoundMatch( bool match );
 
-    /**
-     * Sets a flag to indicate that the current search for matches has reached the top or bottom of
-     * the document and has been continued again from the other end of the document.
-     *
-     * This flag will be cleared when the user presses the buttons to find a next or previous match.
-     */
-    void setContinueFlag( Continue flag );
-
     /** Returns the current search text */
     QString searchText();
 
@@ -159,7 +135,6 @@ private:
     bool _foundMatch;
 
     KLineEdit* _searchEdit;
-    QLabel* _continueLabel;
     QProgressBar* _progress;
     QAction* _caseSensitive;
     QAction* _regExpression;

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