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

List:       kde-commits
Subject:    kdenetwork/kdict
From:       Henrique Pinto <stampede () coltec ! ufmg ! br>
Date:       2005-05-01 13:56:52
Message-ID: 20050501135652.B4A5C672 () office ! kde ! org
[Download RAW message or body]

CVS commit by pinto: 


	* Don't rely on the combobox content to set the window caption.
	 BUGS: 58028


  M +2 -2      dict.cpp   1.33
  M +1 -1      dict.h   1.7
  M +3 -3      queryview.cpp   1.18
  M +1 -1      queryview.h   1.10


--- kdenetwork/kdict/dict.cpp  #1.32:1.33
@@ -1423,5 +1423,5 @@ void DictInterface::clientDone()
         }
         emit stopped(message);
-        emit resultReady(job->result);
+        emit resultReady(job->result, job->query);
         break;
       case JobData::TMatch:
@@ -1442,5 +1442,5 @@ void DictInterface::clientDone()
         message = i18n(" Received information ");
         emit stopped(message);
-        emit resultReady(job->result);
+        emit resultReady(job->result, job->query);
       }
     } else {

--- kdenetwork/kdict/dict.h  #1.6:1.7
@@ -176,5 +176,5 @@ signals:
 
   void infoReady();                   // updateServer done
-  void resultReady(const QString &result);     // define done
+  void resultReady(const QString &result, const QString &query);     // define done
   void matchReady(const QStringList &result);  // match done
   void started(const QString &message);      // Client is active now, activate \
indicator

--- kdenetwork/kdict/queryview.cpp  #1.17:1.18
@@ -150,5 +150,5 @@ QueryView::QueryView(QWidget *_parent)
   connect(part->browserExtension(),SIGNAL(enableAction(const char \
*,bool)),this,SLOT(enableAction(const char *,bool)));  QTimer::singleShot( 0, this, \
                SLOT(optionsChanged()) );
-  connect(interface,SIGNAL(resultReady(const QString &)), SLOT(resultReady(const \
QString &))); +  connect(interface,SIGNAL(resultReady(const QString &, const QString \
&)), SLOT(resultReady(const QString &, const QString &)));  }
 
@@ -332,7 +332,7 @@ void QueryView::showResult()
 
 
-void QueryView::resultReady(const QString &result)
+void QueryView::resultReady(const QString &result, const QString &query)
 {
-  BrowseData* brw = new BrowseData(result,actQueryCombo->currentText());
+  BrowseData* brw = new BrowseData(result,query);
 
   if (browseList.isEmpty()) {

--- kdenetwork/kdict/queryview.h  #1.9:1.10
@@ -143,5 +143,5 @@ protected:
 protected slots:
 
-  void resultReady(const QString &result);
+  void resultReady(const QString &result, const QString &query);
   void partCompleted();
   void slotURLRequest (const KURL &url, const KParts::URLArgs &args);


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