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

List:       kde-commits
Subject:    KDE/kdeaccessibility/kttsd
From:       Jeremy Paul Whiting <jeremy () scitools ! com>
Date:       2009-07-15 21:03:21
Message-ID: 1247691801.375750.4934.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997476 by whiting:

fix some krazy issues, and remove deprecated testplayer.h from libkttsd

 M  +4 -2      kcmkttsmgr/addtalker.cpp  
 M  +0 -1      kcmkttsmgr/kcmkttsmgr.cpp  
 M  +3 -3      kttsjobmgr/kttsjobmgr.cpp  
 M  +1 -1      libkttsd/selecttalkerdlg.cpp  
 D             libkttsd/testplayer.cpp  
 D             libkttsd/testplayer.h  


--- trunk/KDE/kdeaccessibility/kttsd/kcmkttsmgr/addtalker.cpp #997475:997476
@@ -33,6 +33,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <kmessagebox.h>
 
 #include "libspeechd.h"
 
@@ -46,8 +47,9 @@
     if (connection == NULL)
     {
         // TODO: make this show an error dialog of some kind
-        kError() << "could not connect to speech-dispatcher to find available \
synthesizers and languages"; +        KMessageBox::error(parent, "could not connect \
to speech-dispatcher to find available synthesizers and languages", \
"speech-dispatcher not running");  close();
+        return;
     }
 
     char ** modulenames = spd_list_modules(connection);
@@ -57,7 +59,7 @@
         ++modulenames;
     }
 
-    foreach (QString module, m_outputModules)
+    foreach (const QString module, m_outputModules)
     {
         AvailableTalkersTable->setSortingEnabled(false);
         if (spd_set_output_module(connection, module.toUtf8().data()) == 0)
--- trunk/KDE/kdeaccessibility/kttsd/kcmkttsmgr/kcmkttsmgr.cpp #997475:997476
@@ -64,7 +64,6 @@
 // KTTS includes.
 #include "talkercode.h"
 #include "filterconf.h"
-#include "testplayer.h"
 #include "selecttalkerdlg.h"
 #include "selectlanguagedlg.h"
 #include "utils.h"
--- trunk/KDE/kdeaccessibility/kttsd/kttsjobmgr/kttsjobmgr.cpp #997475:997476
@@ -282,11 +282,11 @@
         QString talkerCode;
         if (ndx >= 0)
             talkerCode = m_talkerCodesToTalkerIDs.keys()[ndx];
-        SelectTalkerDlg dlg(widget(), "selecttalkerdialog", i18n("Select Talker"), \
                talkerCode, true);
-        int dlgResult = dlg.exec();
+        QPointer<SelectTalkerDlg> dlg = new SelectTalkerDlg(widget(), \
"selecttalkerdialog", i18n("Select Talker"), talkerCode, true); +        int \
dlgResult = dlg->exec();  if (dlgResult != KDialog::Accepted)
             return;
-        talkerCode = dlg.getSelectedTalkerCode();
+        talkerCode = dlg->getSelectedTalkerCode();
         int jobNum = job.jobNum;
         m_kspeech->changeJobTalker(jobNum, talkerCode);
         refreshJob(jobNum);
--- trunk/KDE/kdeaccessibility/kttsd/libkttsd/selecttalkerdlg.cpp #997475:997476
@@ -164,7 +164,7 @@
 
 void SelectTalkerDlg::slotLanguageBrowseButton_clicked()
 {
-    SelectLanguageDlg* dlg = new SelectLanguageDlg(
+    QPointer<SelectLanguageDlg> dlg = new SelectLanguageDlg(
         this,
         i18n("Select Language"),
         QStringList(m_talkerCode.fullLanguageCode()),


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