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

List:       kde-commits
Subject:    koffice/tools
From:       Fredy Yanardi <fyanardi () gmail ! com>
Date:       2007-08-02 3:32:34
Message-ID: 1186025554.488600.19044.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 695406 by fyanardi:

Some EBN fixes for koffice/tools & remove redundant lines


 M  +4 -12     thesaurus/Thesaurus.cpp  
 M  +1 -1      thumbnail/kofficecreator.cpp  
 M  +2 -3      thumbnail/kofficecreator.h  


--- trunk/koffice/tools/thesaurus/Thesaurus.cpp #695405:695406
@@ -78,7 +78,7 @@
     m_dialog = new KDialog(0);
     m_dialog->setButtons(KDialog::Help | KDialog::Ok | KDialog::Cancel);
     m_dialog->setDefaultButton(KDialog::Ok);
-    m_dialog->setHelp(QString::null, "thesaurus");
+    m_dialog->setHelp(QString(), "thesaurus");
     m_dialog->resize(600, 400);
 
     KConfigGroup cfg = KGlobal::config()->group("");
@@ -399,7 +399,7 @@
         (void) new KRun(KUrl(term),0L);
     }
     else {
-        if (addToHistory) {
+        if (addToHistory && m_edit->itemText(0) != term) {
             m_edit->insertItem(0, term);
             m_historyPos = m_edit->count();
             m_edit->setCurrentIndex(0);
@@ -424,7 +424,7 @@
 
     // Find only whole words. Looks clumsy, but this way we don't have to rely on
     // features that might only be in certain versions of grep:
-    QString searchTermTmp = ";" + searchTerm.trimmed() + ";";
+    QString searchTermTmp = ';' + searchTerm.trimmed() + ';';
     m_thesProc->setOutputChannelMode(KProcess::SeparateChannels);
     m_thesProc->clearProgram();
     m_thesProc->setReadChannel(QProcess::StandardOutput);
@@ -437,8 +437,7 @@
 
     m_thesProc->start();
     if (!m_thesProc->waitForFinished()) {
-        KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep. "
-                    "Output:<br>%1", QString(m_thesProc->readAllStandardError())));
+        KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep."));
         return;
     }
 
@@ -646,13 +645,6 @@
         return;
     }
 
-    QString stderrString = m_wnProc->readAllStandardError();
-    if (!stderrString.isEmpty()) {
-        m_resultTextBrowser->setHtml(i18n("<b>Error:</b> Failed to execute WordNet program 'wn'. "
-                    "Output:<br>%1", stderrString));
-        return;
-    }
-
     QString stdoutString = m_wnProc->readAllStandardOutput();
     if (stdoutString.isEmpty()) {
         m_resultTextBrowser->setHtml(i18n("No match for '%1'.", m_edit->currentText()));
--- trunk/koffice/tools/thumbnail/kofficecreator.cpp #695405:695406
@@ -69,7 +69,7 @@
 
     QString mimetype = KMimeType::findByPath( path )->name();
 
-    m_doc = KParts::ComponentFactory::createPartInstanceFromQuery<KoDocument>( mimetype, QString::null);
+    m_doc = KParts::ComponentFactory::createPartInstanceFromQuery<KoDocument>( mimetype, QString());
 
     if (!m_doc) return false;
 
--- trunk/koffice/tools/thumbnail/kofficecreator.h #695405:695406
@@ -17,12 +17,11 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KWORDCREATOR_H_
-#define _KWORDCREATOR_H_ 
+#ifndef _KOFFICECREATOR_H_
+#define _KOFFICECREATOR_H_ 
 
 #include <kio/thumbcreator.h>
 #include <kparts/part.h>
-#include "KoDocument.h"
 //Added by qt3to4:
 #include <QTimerEvent>
 
[prev in list] [next in list] [prev in thread] [next in thread]