Fixing krazy2 issues
Thomas Richard <[email protected]>
| Newsgroups | gmane.comp.kde.devel.accessibility |
|---|---|
| Message-ID | <[email protected]> |
Hi all,
in response to the Kourse that's currently running on the message
boards i've prepared some patches to fix krazy2 issues in
kdeaccesibilty. You can find them in the attachement. Please take a
good look before committing because these are my first patches.
Some issues still remain as i don't know how to solve them.
Issues that still need fixing (kmousetool)
* Can't find the author of Xmd_kmousetool.h
* Don't know how to fix cmake issue: O/S or Compiler specific
macro line#61[__sgi] (1)
C++ source files and non-installed headers should NOT use cpp
conditionals that check for a certain O/S or compiler; instead use
CMake HAVE_foo macros. We want to check for features discovered
during CMake time rather than for a specific O/S.
Issues that still need fixing (kmouth)
* Icons, don't know what to do with them. Krazy says something
about reporting them to team oxygen
Specially take a look at:
* -open()
+this->open()
Issues that still need fixing (kttsd)
* Don't know how to fix cmake issue: O/S or Compiler specific
macro line#61[__sgi] (1)
C++ source files and non-installed headers should NOT use cpp
conditionals that check for a certain O/S or compiler; instead use
CMake HAVE_foo macros. We want to check for features discovered
during CMake time rather than for a specific O/S.
Specially take a look at:
* Commenting out the foreach issues
Best regards (and please let me know when I did something wrong!)
Thomas
_______________________________________________
kde-accessibility mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-accessibility
kmag.diff
(text/x-diff, 2.5 KB)
Index: kmag.cpp
===================================================================
--- kmag.cpp (revision 910110)
+++ kmag.cpp (working copy)
@@ -91,7 +91,7 @@
fpsArray.push_back(15); // high
fpsArray.push_back(25); // very high
- colorArrayString << i18n("&Normal") << i18n("&Protanopia") << i18n("&Deuteranopia") << i18n("&Tritanopia") << i18n("&Achromatopsia");
+ colorArrayString << i18nc("The normal color", "&Normal") << i18n("&Protanopia") << i18n("&Deuteranopia") << i18n("&Tritanopia") << i18n("&Achromatopsia");
colorArray.push_back(0);
colorArray.push_back(1);
@@ -253,7 +253,7 @@
m_pFPSBox->setWhatsThis(i18n("Select the refresh rate. The higher the rate, the more computing power (CPU) will be needed."));
m_pFPSBox->setToolTip(i18n("Refresh rate"));
- m_pColorBox = new KSelectAction(i18n("&Color"),this);
+ m_pColorBox = new KSelectAction(i18nc("Color of the view", "&Color"),this);
actionCollection()->addAction("color_mode", m_pColorBox);
m_pColorBox->setItems(colorArrayString);
m_pColorBox->setWhatsThis(i18n("Select a mode to simulate various types of color-blindness."));
@@ -664,7 +664,7 @@
refreshSwitch->setToolTip(i18n("Click to stop window update"));
} else {
refreshSwitch->setIcon(KIcon("reload.png"));
- refreshSwitch->setText(i18n("Start"));
+ refreshSwitch->setText(i18nc("Start updating the window", "Start"));
refreshSwitch->setToolTip(i18n("Click to start window update"));
}
}
Index: kmagzoomview.h
===================================================================
--- kmagzoomview.h (revision 910110)
+++ kmagzoomview.h (working copy)
@@ -14,12 +14,13 @@
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; version 2 of the License *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
* *
***************************************************************************/
-#ifndef KMagZoomView_h_
-#define KMagZoomView_h_
+#ifndef KMagZoomView_h
+#define KMagZoomView_h
// include files for Qt
#include <QtGui/QWidget>
@@ -241,4 +242,4 @@
bool m_fitToWindow;
};
-#endif // KMagZoomView_h_
+#endif // KMagZoomView_h
kmousetool.diff
(text/x-diff, 3.9 KB)
Index: kmousetool/kmousetool.cpp
===================================================================
--- kmousetool/kmousetool.cpp (revision 910110)
+++ kmousetool/kmousetool.cpp (working copy)
@@ -493,7 +493,7 @@
if (mousetool_is_running)
buttonStartStop->setText(i18n("&Stop"));
else
- buttonStartStop->setText(i18n("&Start"));
+ buttonStartStop->setText(i18nc("Start tracking the mouse", "&Start"));
trayIcon->updateStartStopText(mousetool_is_running);
}
@@ -620,7 +620,7 @@
{
setObjectName(name);
- startStopAct = contextMenu()->addAction (i18n("&Start"), this, SIGNAL(startStopSelected()));
+ startStopAct = contextMenu()->addAction (i18nc("Start tracking the mouse", "&Start"), this, SIGNAL(startStopSelected()));
contextMenu()->addSeparator();
QAction* act;
act = contextMenu()->addAction (i18n("&Configure KMouseTool..."), this, SIGNAL(configureSelected()));
@@ -644,7 +644,7 @@
icon = KIconLoader::global()->loadIcon("kmousetool_on", KIconLoader::Small);
}
else {
- startStopAct->setText(i18n("&Start"));
+ startStopAct->setText(i18nc("Start tracking the mouse", "&Start"));
icon = KIconLoader::global()->loadIcon("kmousetool_off", KIconLoader::Small);
}
setIcon (icon);
Index: kmousetool/mtstroke.cpp
===================================================================
--- kmousetool/mtstroke.cpp (revision 910110)
+++ kmousetool/mtstroke.cpp (working copy)
@@ -79,7 +79,7 @@
bool MTStroke::pointsContain(Pt pt)
{
std::vector<Pt>::iterator pos;
- for (pos=points.begin(); pos<points.end(); pos++) {
+ for (pos=points.begin(); pos<points.end(); ++pos) {
if (pt.x==pos->x && pt.y==pos->y)
return true;
}
@@ -133,7 +133,7 @@
int scale = (int) delta/2;
std::vector<Pt>::iterator pos;
- for (pos=points.begin(); pos<points.end(); pos++) {
+ for (pos=points.begin(); pos<points.end(); ++pos) {
// add an extra (scale/2) because the divide rounds _down_, and we want to
// round _up_ or _down_, depending on which is closer.
@@ -170,7 +170,7 @@
stroke_maxy = 0;
std::vector<Pt>::iterator pos;
- for (pos=points.begin(); pos<points.end(); pos++) {
+ for (pos=points.begin(); pos<points.end(); ++pos) {
if (stroke_minx > pos->x)
stroke_minx = pos->x;
if (stroke_maxx < pos->x)
Index: kmousetool/version.h
===================================================================
--- kmousetool/version.h (revision 910110)
+++ kmousetool/version.h (working copy)
@@ -1,8 +1,27 @@
-// KMouseTool Version Information
-//
+/***************************************************************************
+ version.h - KMouseTool Version Informatio
+ -------------------
+ begin : Sun Jan 20 23:27:58 PST 2002
+ copyright : (C) 2002-2003 by Jeff Roush
+ email : [email protected]
+ copyright : (C) 2003 by Olaf Schmidt
+ email : [email protected]
+ copyright : (C) 2003 by Gunnar Schmi Dt
+ email : [email protected]
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
#ifndef kmousetool_version_h
#define kmousetool_version_h
#define KMOUSETOOL_VERSION "1.12"
-#endif /*version_h*/
+#endif /*kmousetool_version_h*/
kmouth.diff
(text/x-diff, 20.8 KB)
Index: kmouth.cpp
===================================================================
--- kmouth.cpp (revision 910110)
+++ kmouth.cpp (working copy)
@@ -151,7 +151,7 @@
editSpeak = actionCollection()->addAction("edit_speak");
editSpeak->setIcon(KIcon("speak"));
- editSpeak->setText(i18n("&Speak"));
+ editSpeak->setText(i18nc("Start speaking", "&Speak"));
connect(editSpeak, SIGNAL(triggered(bool)), phraseList, SLOT(speak()));
editSpeak->setToolTip(i18n("Speaks the currently active sentence(s)"));
editSpeak->setWhatsThis (i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken."));
@@ -241,7 +241,7 @@
///////////////////////////////////////////////////////////////////
// STATUSBAR
// TODO: add your own items you need for displaying current application status.
- statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG);
+ statusBar()->insertItem(i18nc("The job is done", "Ready."), ID_STATUS_MSG);
}
void KMouthApp::initPhraseList()
@@ -259,7 +259,7 @@
slotStatusMsg(i18n("Opening file..."));
phraseList->open (url);
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::saveOptions() {
@@ -368,7 +368,7 @@
phraseList->open();
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotFileSaveAs() {
@@ -376,7 +376,7 @@
phraseList->save();
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotFilePrint()
@@ -394,12 +394,12 @@
phraseList->print(printer);
}
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotFileQuit()
{
- slotStatusMsg(i18n("Exiting..."));
+ slotStatusMsg(i18nc("Shutting down the application", "Exiting..."));
saveOptions();
// close the first window, the list makes the next one the first again.
// This ensures that queryClose() is called on each window to ask for closing
@@ -444,7 +444,7 @@
else
menuBar()->show();
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotViewToolBar()
@@ -461,7 +461,7 @@
toolBar("mainToolBar")->show();
}
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotViewPhrasebookBar()
@@ -478,7 +478,7 @@
toolBar("phrasebookBar")->show();
}
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotViewStatusBar()
@@ -495,7 +495,7 @@
statusBar()->show();
}
- slotStatusMsg(i18n("Ready."));
+ slotStatusMsg(i18nc("The job is done", "Ready."));
}
void KMouthApp::slotConfigureTTS() {
Index: texttospeechconfigurationwidget.cpp
===================================================================
--- texttospeechconfigurationwidget.cpp (revision 910110)
+++ texttospeechconfigurationwidget.cpp (working copy)
@@ -45,10 +45,10 @@
}
void TextToSpeechConfigurationWidget::buildCodecList () {
- QString local = i18n("Local")+" (";
+ QString local = i18nc("Local characterset", "Local")+" (";
local += QTextCodec::codecForLocale()->name() + ')';
characterCodingBox->addItem (local, Speech::Local);
- characterCodingBox->addItem (i18n("Latin1"), Speech::Latin1);
+ characterCodingBox->addItem (i18nc("Latin1 characterset", "Latin1"), Speech::Latin1);
characterCodingBox->addItem (i18n("Unicode"), Speech::Unicode);
for (int i = 0; i < ttsSystem->codecList->count(); i++ )
characterCodingBox->addItem (ttsSystem->codecList->at(i)->name(), Speech::UseCodec + i);
Index: optionsdialog.cpp
===================================================================
--- optionsdialog.cpp (revision 910110)
+++ optionsdialog.cpp (working copy)
@@ -24,11 +24,11 @@
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <Qt3Support/Q3Grid>
-#include <QtGui/QTabWidget>
#include <QtGui/QPixmap>
#include <QtCore/QFile>
#include <kcombobox.h>
+#include <ktabwidget.h>
#include <klocale.h>
#include <kconfig.h>
#include <kglobal.h>
@@ -125,7 +125,7 @@
//addGridPage (1, Qt::Horizontal, i18n("General Options"), QString(), iconGeneral);
- tabCtl = new QTabWidget();
+ tabCtl = new KTabWidget();
tabCtl->setObjectName("general");
behaviourWidget = new PreferencesWidget (tabCtl, "prefPage");
Index: phraselist.h
===================================================================
--- phraselist.h (revision 910110)
+++ phraselist.h (working copy)
@@ -44,7 +44,7 @@
class PhraseList : public QWidget {
Q_OBJECT
public:
- PhraseList(QWidget *parent=0, const char *name=0);
+ explicit PhraseList(QWidget *parent=0, const char *name=0);
~PhraseList();
/** contains the implementation for printing functionality */
--- phrasebook/phrasebookparser.h (revision 910110)
+++ phrasebook/phrasebookparser.h (working copy)
@@ -18,8 +18,9 @@
#ifndef PHRASEBOOKPARSER_H
#define PHRASEBOOKPARSER_H
-#include <QtXml>
#include <Qt3Support/Q3ValueStack>
+#include <QtXml/QXmlParseException>
+#include <QtXml/QXmlAttributes>
#include "phrasebook.h"
Index: phrasebook/phrasebook.h
===================================================================
--- phrasebook/phrasebook.h (revision 910110)
+++ phrasebook/phrasebook.h (working copy)
@@ -20,10 +20,10 @@
#include <QtCore/QObject>
#include <Qt3Support/Q3DragObject>
-#include <QtXml>
#include <QtCore/QTextStream>
#include <QtGui/QMenu>
#include <QtGui/QPrinter>
+#include <QtXml/QXmlInputSource>
#include <ktoolbar.h>
#include <kaction.h>
@@ -62,7 +62,7 @@
class PhraseBookEntry {
public:
PhraseBookEntry ();
- PhraseBookEntry (Phrase phrase, int level = 1, bool isPhrase = true);
+ explicit PhraseBookEntry (Phrase phrase, int level = 1, bool isPhrase = true);
~PhraseBookEntry () {}
void setPhrase (Phrase phrase, int level = 1, bool isPhrase = true);
@@ -154,8 +154,8 @@
class PhraseBookDrag: public Q3DragObject {
Q_OBJECT
public:
- PhraseBookDrag (PhraseBook *book, QWidget *dragSource = 0, const char *name = 0);
- PhraseBookDrag (QWidget *dragSource = 0, const char *name = 0);
+ explicit PhraseBookDrag (PhraseBook *book, QWidget *dragSource = 0, const char *name = 0);
+ explicit PhraseBookDrag (QWidget *dragSource = 0, const char *name = 0);
~PhraseBookDrag ();
virtual void setBook (PhraseBook *book);
Index: phrasebook/phrasebookdialog.h
===================================================================
--- phrasebook/phrasebookdialog.h (revision 910110)
+++ phrasebook/phrasebookdialog.h (working copy)
@@ -131,7 +131,7 @@
*/
class ButtonBoxWidget : public QWidget, public Ui::ButtonBoxUI {
public:
- ButtonBoxWidget (QWidget *parent = 0, const char *name = 0);
+ explicit ButtonBoxWidget (QWidget *parent = 0, const char *name = 0);
~ButtonBoxWidget ();
KKeySequenceWidget *keyButton;
Index: phrasebook/phrasetree.h
===================================================================
--- phrasebook/phrasetree.h (revision 910110)
+++ phrasebook/phrasetree.h (working copy)
@@ -64,7 +64,7 @@
friend class PhraseTreeItem;
Q_OBJECT
public:
- PhraseTree (QWidget *parent = 0, const char *name = 0);
+ explicit PhraseTree (QWidget *parent = 0, const char *name = 0);
~PhraseTree ();
void keyPressEvent (QKeyEvent *e);
Index: phrasebook/phrasebook.cpp
===================================================================
--- phrasebook/phrasebook.cpp (revision 910110)
+++ phrasebook/phrasebook.cpp (working copy)
@@ -20,11 +20,12 @@
#include <QtGui/QPainter>
#include <QtCore/QFile>
-#include <QtXml>
#include <QtCore/QRegExp>
#include <QtCore/QStack>
#include <QtCore/QTextStream>
#include <QtGui/QMenu>
+#include <QtXml/QXmlInputSource>
+#include <QtXml/QXmlSimpleReader>
#include <kactionmenu.h>
#include <kactioncollection.h>
Index: phrasebook/phrasebookdialog.cpp
===================================================================
--- phrasebook/phrasebookdialog.cpp (revision 910110)
+++ phrasebook/phrasebookdialog.cpp (working copy)
@@ -181,12 +181,12 @@
Q3ListViewItem *parent = 0;
Q3ListViewItem *last = 0;
QStringList currentNamePath;
- currentNamePath<<"";
+ currentNamePath<<QString("");
Q3PtrStack<Q3ListViewItem> stack;
StandardBookList::iterator it;
for (it = bookPaths.begin(); it != bookPaths.end(); ++it) {
QString namePath = (*it).path;
- QStringList dirs = namePath.split( "/");
+ QStringList dirs = namePath.split( '/');
QStringList::iterator it1=currentNamePath.begin();
QStringList::iterator it2=dirs.begin();
@@ -490,7 +490,7 @@
url.setPath((*it).filename);
QString namePath = "x/"+(*it).path;
- QStringList dirs = namePath.split( "/");
+ QStringList dirs = namePath.split( '/');
QStringList::iterator it1=currentNamePath.begin();
QStringList::iterator it2=dirs.begin();
Index: kmouth.h
===================================================================
--- kmouth.h (revision 910110)
+++ kmouth.h (working copy)
@@ -56,7 +56,7 @@
public:
/** construtor of KMouthApp, calls all init functions to create the application.
*/
- KMouthApp(QWidget* parent=0, const char* name=0);
+ explicit KMouthApp(QWidget* parent=0, const char* name=0);
~KMouthApp();
/** Returns true if the configuration wizard was not needed or when it
* was successfully completed.
Index: phraselist.cpp
===================================================================
--- phraselist.cpp (revision 910110)
+++ phraselist.cpp (working copy)
@@ -459,7 +459,7 @@
i18n("*|All Files\n*.phrasebook|Phrase Books (*.phrasebook)\n*.txt|Plain Text Files (*.txt)"), this, i18n("Open File as History"));
if(!url.isEmpty())
- open (url);
+ this->open (url);
}
void PhraseList::open (KUrl url) {
Index: optionsdialog.h
===================================================================
--- optionsdialog.h (revision 910110)
+++ optionsdialog.h (working copy)
@@ -27,7 +27,7 @@
#include "ui_preferencesui.h"
#include "texttospeechconfigurationwidget.h"
-class QTabWidget;
+class KTabWidget;
class KCModule;
class WordCompletionWidget;
@@ -80,7 +80,7 @@
void slotApply();
private:
- QTabWidget *tabCtl;
+ KTabWidget *tabCtl;
TextToSpeechConfigurationWidget *commandWidget;
PreferencesWidget *behaviourWidget;
KCModule *kttsd;
Index: wordcompletion/dictionarycreationwizard.h
===================================================================
--- wordcompletion/dictionarycreationwizard.h (revision 910110)
+++ wordcompletion/dictionarycreationwizard.h (working copy)
@@ -23,8 +23,10 @@
#include <QtCore/QList>
#include <QtCore/QMap>
#include <Qt3Support/Q3Dict>
+#include <Q3ScrollView>
#include <k3wizard.h>
+#include <kcombobox.h>
#include <knuminput.h>
#include "ui_creationsourceui.h"
@@ -33,7 +35,7 @@
class CompletionWizardWidget;
class QTextCodec;
-class QComboBox;
+class KComboBox;
class MergeWidget;
class CreationSourceDetailsWidget : public QWidget, public Ui::CreationSourceDetailsUI {
@@ -93,7 +95,7 @@
private:
void buildCodecList ();
- void buildCodecCombo (QComboBox *combo);
+ void buildCodecCombo (KComboBox *combo);
CreationSourceWidget *creationSource;
CreationSourceDetailsWidget *fileWidget;
Index: wordcompletion/wordcompletion.cpp
===================================================================
--- wordcompletion/wordcompletion.cpp (revision 910110)
+++ wordcompletion/wordcompletion.cpp (working copy)
@@ -1,4 +1,20 @@
+/***************************************************************************
+ wordcompletion.cpp - description
+ -------------------
+ begin : Tue Apr 29 2003
+ copyright : (C) 2002 by Gunnar Schmi Dt
+ email : [email protected]
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
#include "wordcompletion.h"
#include <QtCore/QRegExp>
@@ -118,7 +134,7 @@
KConfig *config = new KConfig("kmouthrc");
const QStringList groups = config->groupList();
for (QStringList::const_iterator it = groups.constBegin(); it != groups.constEnd(); ++it)
- if ((*it).startsWith ("Dictionary ")) {
+ if ((*it).startsWith (QString("Dictionary "))) {
KConfigGroup cg(config, *it);
WordCompletionPrivate::DictionaryDetails details;
details.filename = cg.readEntry("Filename");
@@ -161,7 +177,7 @@
while (!stream.atEnd()) {
QString s = stream.readLine();
if (!(s.isNull() || s.isEmpty())) {
- QStringList list = s.split( "\t");
+ QStringList list = s.split( '\t');
bool ok;
int weight = list[1].toInt(&ok);
if (ok && (weight > 0))
Index: wordcompletion/wordlist.cpp
===================================================================
--- wordcompletion/wordlist.cpp (revision 910110)
+++ wordcompletion/wordlist.cpp (working copy)
@@ -22,6 +22,10 @@
#include <QtCore/QRegExp>
#include <QtCore/QDir>
#include <QtCore/QTextStream>
+#include <QtXml/QXmlParseException>
+#include <QtXml/QXmlAttributes>
+#include <QtXml/QXmlInputSource>
+#include <QtXml/QXmlSimpleReader>
#include <kstandarddirs.h>
#include <kprogressdialog.h>
@@ -183,7 +187,7 @@
while (!stream.atEnd()) {
QString s = stream.readLine();
if (!(s.isNull() || s.isEmpty())) {
- QStringList list = s.split( "\t");
+ QStringList list = s.split( '\t');
bool ok;
int weight = list[1].toInt(&ok);
if (ok && (weight > 0)) {
@@ -401,14 +405,14 @@
}
}
- if (s.startsWith("PFX")) {
+ if (s.startsWith(QString("PFX"))) {
AffList list;
if (prefixes.contains (fields[1][0]))
list = prefixes[fields[1][0]];
list << e;
prefixes[fields[1][0]] = list;
}
- else if (s.startsWith("SFX")) {
+ else if (s.startsWith(QString("SFX"))) {
AffList list;
if (suffixes.contains (fields[1][0]))
list = suffixes[fields[1][0]];
@@ -499,7 +503,7 @@
WordMap spellCheck (WordMap map, QString dictionary, KProgressDialog *pdlg) {
- if (dictionary.endsWith(".dic")) {
+ if (dictionary.endsWith(QString(".dic"))) {
AffMap prefixes;
AffMap suffixes;
WordMap checkedMap;
Index: wordcompletion/wordcompletionwidget.cpp
===================================================================
--- wordcompletion/wordcompletionwidget.cpp (revision 910110)
+++ wordcompletion/wordcompletionwidget.cpp (working copy)
@@ -134,7 +134,7 @@
const QStringList groups = config->groupList();
DictionaryListItem *last = 0;
for (QStringList::const_iterator it = groups.constBegin(); it != groups.constEnd(); ++it)
- if ((*it).startsWith ("Dictionary ")) {
+ if ((*it).startsWith (QString("Dictionary "))) {
KConfigGroup cg (config, *it);
QString languageTag = cg.readEntry("Language");
last = new DictionaryListItem (dictionaryList, last,
@@ -157,7 +157,7 @@
void WordCompletionWidget::save() {
const QStringList groups = config->groupList();
for (QStringList::const_iterator it = groups.constBegin(); it != groups.constEnd(); ++it)
- if ((*it).startsWith ("Dictionary "))
+ if ((*it).startsWith (QString("Dictionary ")))
config->deleteGroup (*it);
int number = 0;
Index: wordcompletion/wordcompletion.h
===================================================================
--- wordcompletion/wordcompletion.h (revision 910110)
+++ wordcompletion/wordcompletion.h (working copy)
@@ -1,3 +1,20 @@
+/***************************************************************************
+ wordcompletionwidget.cpp - description
+ -------------------
+ begin : Tue Apr 29 2003
+ copyright : (C) 2002 by Gunnar Schmi Dt
+ email : [email protected]
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ ***************************************************************************/
+
#ifndef WORDCOMPLETION_H
#define WORDCOMPLETION_H
Index: wordcompletion/dictionarycreationwizard.cpp
===================================================================
--- wordcompletion/dictionarycreationwizard.cpp (revision 910110)
+++ wordcompletion/dictionarycreationwizard.cpp (working copy)
@@ -15,15 +15,17 @@
* *
***************************************************************************/
+#include "dictionarycreationwizard.h"
+#include "wordlist.h"
+
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QtGui/QCheckBox>
#include <QtGui/QRadioButton>
#include <QtGui/QLineEdit>
-#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
-#include <QtGui/QGridLayout>
#include <k3listview.h>
#include <klineedit.h>
@@ -35,8 +37,6 @@
#include <kconfig.h>
#include <kprogressdialog.h>
#include <klanguagebutton.h>
-#include "dictionarycreationwizard.h"
-#include "wordlist.h"
DictionaryCreationWizard::DictionaryCreationWizard (QWidget *parent, const char *name,
const QStringList &dictionaryNames, const QStringList &dictionaryFiles,
@@ -56,7 +56,7 @@
dirWidget= new CreationSourceDetailsWidget (this, "directory source page");
addPage (dirWidget, i18n("Source of New Dictionary (2)"));
- dirWidget->urlLabel->setText (i18n("&Directory:"));
+ dirWidget->urlLabel->setText (i18nc("In which directory is the file located?", "&Directory:"));
dirWidget->urlLabel->setWhatsThis( i18n("With this input field you specify which directory you want to load for creating the new dictionary."));
dirWidget->url->setMode(KFile::Directory);
dirWidget->url->setWhatsThis( i18n("With this input field you specify which directory you want to load for creating the new dictionary."));
@@ -96,12 +96,13 @@
}
}
-void DictionaryCreationWizard::buildCodecCombo (QComboBox *combo) {
- QString local = i18n("Local")+" (";
+void DictionaryCreationWizard::buildCodecCombo (KComboBox *combo) {
+ QString local = i18nc("Local characterset", "Local")+" (";
local += QTextCodec::codecForLocale()->name() + ')';
combo->addItem (local, 0);
- combo->addItem (i18n("Latin1"), 1);
+ combo->addItem (i18nc("Latin characterset", "Latin1"), 1);
combo->addItem (i18n("Unicode"), 2);
+
for (int i = 0; i < codecList->count(); i++ )
combo->addItem (codecList->at(i)->name(), i+3);
}
@@ -367,7 +368,7 @@
if (WordList::saveWordList (map, dictionaryFile)) {
KConfigGroup cg(config, "Dictionary 0");
cg.writeEntry ("Filename", "wordcompletion1.dict");
- cg.writeEntry ("Name", i18n("Default"));
+ cg.writeEntry ("Name", i18nc("Default dictionary", "Default"));
cg.writeEntry ("Language", language);
cg.sync();
}
Index: wordcompletion/wordlist.h
===================================================================
--- wordcompletion/wordlist.h (revision 910110)
+++ wordcompletion/wordlist.h (working copy)
@@ -20,7 +20,9 @@
#ifndef WORDLIST_H
#define WORDLIST_H
-#include <QtXml>
+#include <QtXml/QXmlDefaultHandler>
+#include <QtXml/QXmlParseException>
+#include <QtXml/QXmlAttributes>
#include <Qt3Support/Q3ValueStack>
#include <QtCore/QObject>
#include <QtCore/QMap>
kttsd.diff
(text/x-diff, 70.1 KB)
Index: players/alsaplayer/formats.h =================================================================== --- players/alsaplayer/formats.h (revision 910110) +++ players/alsaplayer/formats.h (working copy) @@ -1,3 +1,29 @@ +/***************************************************** vim:set ts=4 sw=4 sts=4: + Formats. + ------------------- + Copyright: + (C) 2005 by Gary Cramblitt <[email protected]> + Portions based on aplay.c in alsa-utils + Copyright (c) by Jaroslav Kysela <[email protected]> + Based on vplay program by Michael Beck + ------------------- + Original author: Gary Cramblitt <[email protected]> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ******************************************************************************/ + #ifndef FORMATS_H #define FORMATS_H 1 Index: players/alsaplayer/alsaplayer.cpp =================================================================== --- players/alsaplayer/alsaplayer.cpp (revision 910110) +++ players/alsaplayer/alsaplayer.cpp (working copy) @@ -125,7 +125,7 @@ /*virtual*/ void AlsaPlayerThread::run() { - QString pName = m_pcmName.section(" ", 0, 0); + QString pName = m_pcmName.section(' ', 0, 0); pcm_name = qstrdup(pName.toAscii().constData()); DBG << "pName = " << pcm_name << endl; int err; Index: libkttsd/talkerlistmodel.cpp =================================================================== --- libkttsd/talkerlistmodel.cpp (revision 910110) +++ libkttsd/talkerlistmodel.cpp (working copy) @@ -122,7 +122,7 @@ case 2: return i18n("Synthesizer"); case 3: return i18n("Voice Code"); case 4: return i18n("Gender"); - case 5: return i18n("Volume"); + case 5: return i18nc("Volume of noise", "Volume"); case 6: return i18n("Rate"); }; Index: libkttsd/filterconf.h =================================================================== --- libkttsd/filterconf.h (revision 910110) +++ libkttsd/filterconf.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FILTERCONF_H_ -#define _FILTERCONF_H_ +#ifndef FILTERCONF_H +#define FILTERCONF_H // Qt includes. #include <QtGui/QWidget> @@ -145,4 +145,4 @@ QStringList m_path; }; -#endif //_FILTERCONF_H_ +#endif //FILTERCONF_H Index: libkttsd/utils.cpp =================================================================== --- libkttsd/utils.cpp (revision 910110) +++ libkttsd/utils.cpp (working copy) @@ -38,7 +38,7 @@ // Strip all whitespace and go from there. QString doc = xmldoc.simplified(); // Take off the <?xml...?> if it exists - if(doc.startsWith("<?xml")) { + if(doc.startsWith(QString("<?xml"))) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> int xmlStatementEnd = doc.indexOf("?>"); @@ -50,7 +50,7 @@ doc = doc.right(doc.length() - xmlStatementEnd); } // Take off leading comments, if they exist. - while(doc.startsWith("<!--") || doc.startsWith(" <!--")) { + while(doc.startsWith(QString("<!--")) || doc.startsWith(QString(" <!--"))) { int commentStatementEnd = doc.indexOf("-->"); if(commentStatementEnd == -1) { kDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; @@ -60,7 +60,7 @@ doc = doc.right(doc.length() - commentStatementEnd); } // Take off the doctype statement if it exists. - while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) { + while(doc.startsWith(QString("<!DOCTYPE")) || doc.startsWith(QString(" <!DOCTYPE"))) { int doctypeStatementEnd = doc.indexOf(">"); if(doctypeStatementEnd == -1) { kDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; @@ -70,7 +70,7 @@ doc = doc.right(doc.length() - doctypeStatementEnd); } // We should (hopefully) be left with the root element. - return (doc.startsWith('<' + elementName) || doc.startsWith(" <" + elementName)); + return (doc.startsWith(QString('<' + elementName)) || doc.startsWith(QString(" <" + elementName))); } /** @@ -85,7 +85,7 @@ // Strip all whitespace and go from there. QString doc = xmldoc.trimmed(); // Take off the <?xml...?> if it exists - if(doc.startsWith("<?xml")) { + if(doc.startsWith(QString("<?xml"))) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> int xmlStatementEnd = doc.indexOf("?>"); @@ -98,7 +98,7 @@ doc = doc.trimmed(); } // Take off leading comments, if they exist. - while(doc.startsWith("<!--")) { + while(doc.startsWith(QString("<!--"))) { int commentStatementEnd = doc.indexOf("-->"); if(commentStatementEnd == -1) { kDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; @@ -110,7 +110,7 @@ } // Match the doctype statement if it exists. // kDebug() << "KttsUtils::hasDoctype: searching " << doc.left(20) << "... for " << "<!DOCTYPE " << name; - return (doc.startsWith("<!DOCTYPE " + name)); + return (doc.startsWith(QString("<!DOCTYPE " + name))); } /** Index: libkttsd/player.h =================================================================== --- libkttsd/player.h (revision 910110) +++ libkttsd/player.h (working copy) @@ -77,4 +77,4 @@ }; -#endif +#endif // PLAYER_H Index: libkttsd/testplayer.h =================================================================== --- libkttsd/testplayer.h (revision 910110) +++ libkttsd/testplayer.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _TESTPLAYER_H_ -#define _TESTPLAYER_H_ +#ifndef TESTPLAYER_H +#define TESTPLAYER_H // Qt includes. #include <QObject> @@ -121,4 +121,4 @@ Player* m_player; }; -#endif // _TESTPLAYER_H_ +#endif // TESTPLAYER_H Index: libkttsd/utils.h =================================================================== --- libkttsd/utils.h (revision 910110) +++ libkttsd/utils.h (working copy) @@ -11,8 +11,9 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * - * * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * ***************************************************************************/ #ifndef UTILS_H Index: libkttsd/stretcher.h =================================================================== --- libkttsd/stretcher.h (revision 910110) +++ libkttsd/stretcher.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _STRETCHER_H_ -#define _STRETCHER_H_ +#ifndef STRETCHER_H +#define STRETCHER_H #include <QObject> @@ -95,4 +95,4 @@ QString m_outFilename; }; -#endif // _STRETCHER_H_ +#endif // STRETCHER_H Index: libkttsd/pluginconf.h =================================================================== --- libkttsd/pluginconf.h (revision 910110) +++ libkttsd/pluginconf.h (working copy) @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#ifndef _PLUGINCONF_H_ -#define _PLUGINCONF_H_ +#ifndef PLUGINCONF_H +#define PLUGINCONF_H // Qt includes. #include <QtGui/QWidget> @@ -375,4 +375,4 @@ TestPlayer* m_player; }; -#endif //_PLUGINCONF_H_ +#endif //PLUGINCONF_H Index: libkttsd/talkercode.cpp =================================================================== --- libkttsd/talkercode.cpp (revision 910110) +++ libkttsd/talkercode.cpp (working copy) @@ -151,7 +151,7 @@ if (!m_volume.isEmpty()) code += ' ' + translatedVolume(stripPrefer(m_volume, prefer)); if (!m_rate.isEmpty()) code += ' ' + translatedRate(stripPrefer(m_rate, prefer)); code = code.trimmed(); - if (code.isEmpty()) code = i18n("default"); + if (code.isEmpty()) code = i18nc("Default language code", "default"); return code; } @@ -229,7 +229,7 @@ QString countryCode; QString language; if (languageCode == "other") - language = i18n("Other"); + language = i18nc("Other language", "Other"); else { splitFullLanguageCode(languageCode, langAlpha, countryCode); @@ -254,18 +254,18 @@ /*static*/ QString TalkerCode::translatedGender(const QString &gender) { if (gender == "male") - return i18n("male"); + return i18nc("Male gender", "male"); else if (gender == "female") - return i18n("female"); + return i18nc("Female gender", "female"); else if (gender == "neutral") return i18nc("neutral gender", "neutral"); else return gender; } /*static*/ QString TalkerCode::untranslatedGender(const QString &gender) { - if (gender == i18n("male")) + if (gender == i18nc("Male gender", "male")) return "male"; - else if (gender == i18n("female")) + else if (gender == i18nc("Female gender", "female")) return "female"; else if (gender == i18nc("neutral gender", "neutral")) return "neutral"; Index: libkttsd/selecttalkerdlg.h =================================================================== --- libkttsd/selecttalkerdlg.h (revision 910110) +++ libkttsd/selecttalkerdlg.h (working copy) @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SELECTTALKERDLG_H_ -#define _SELECTTALKERDLG_H_ +#ifndef SELECTTALKERDLG_H +#define SELECTTALKERDLG_H // KDE includes. #include <kdialog.h> @@ -105,4 +105,4 @@ TalkerCode m_talkerCode; }; -#endif // _SELECTTALKERDLG_H_ +#endif // SELECTTALKERDLG_H Index: libkttsd/filterproc.h =================================================================== --- libkttsd/filterproc.h (revision 910110) +++ libkttsd/filterproc.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FILTERPROC_H_ -#define _FILTERPROC_H_ +#ifndef FILTERPROC_H +#define FILTERPROC_H // Qt includes. #include <QtCore/QObject> @@ -176,4 +176,4 @@ void error(bool keepGoing, const QString &msg); }; -#endif // _FILTERPROC_H_ +#endif // FILTERPROC_H Index: libkttsd/selectlanguagedlg.h =================================================================== --- libkttsd/selectlanguagedlg.h (revision 910110) +++ libkttsd/selectlanguagedlg.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SELECTLANGUAGEDLG_H_ -#define _SELECTLANGUAGEDLG_H_ +#ifndef SELECTLANGUAGEDLG_H +#define SELECTLANGUAGEDLG_H // Qt includes. #include <QtGui/QWidget> @@ -101,4 +101,4 @@ QTableWidget* m_langList; }; -#endif // _SELECTLANGUAGEDLG_H_ +#endif // SELECTLANGUAGEDLG_H Index: libkttsd/kdeexportfix.h =================================================================== --- libkttsd/kdeexportfix.h (revision 910110) +++ libkttsd/kdeexportfix.h (working copy) @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#ifndef _KDEEXPORTFIX_H_ -#define _KDEEXPORTFIX_H_ +#ifndef KDEEXPORTFIX_H +#define KDEEXPORTFIX_H #include <kdeversion.h> #if KDE_VERSION < KDE_MAKE_VERSION (3,3,2) @@ -25,4 +25,4 @@ #define KDE_EXPORT #endif -#endif // _KDEEXPORTFIX_H_ +#endif // KDEEXPORTFIX_H Index: libkttsd/pluginproc.cpp =================================================================== --- libkttsd/pluginproc.cpp (revision 910110) +++ libkttsd/pluginproc.cpp (working copy) @@ -182,11 +182,11 @@ { // kDebug() << "PlugInConf::buildCodecList: Running"; QStringList codecList; - QString local = i18n("Local")+" ("; + QString local = i18nc("Local charset", "Local")+" ("; local += QTextCodec::codecForLocale()->name(); local += ')'; codecList.append(local); - codecList.append(i18n("Latin1")); + codecList.append(i18nc("Latin charset", "Latin1")); codecList.append(i18n("Unicode")); QList<QByteArray> availableCodecs = QTextCodec::availableCodecs(); for (int i = 0; i < availableCodecs.size(); ++i ) Index: libkttsd/talkercode.h =================================================================== --- libkttsd/talkercode.h (revision 910110) +++ libkttsd/talkercode.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _TALKERCODE_H_ -#define _TALKERCODE_H_ +#ifndef TALKERCODE_H +#define TALKERCODE_H // Qt includes. #include <QtCore/QList> @@ -202,4 +202,4 @@ QString m_desktopEntryName; }; -#endif // _TALKERCODE_H_ +#endif // TALKERCODE_H Index: libkttsd/pluginproc.h =================================================================== --- libkttsd/pluginproc.h (revision 910110) +++ libkttsd/pluginproc.h (working copy) @@ -17,8 +17,8 @@ * * ***************************************************************************/ -#ifndef _PLUGINPROC_H_ -#define _PLUGINPROC_H_ +#ifndef PLUGINPROC_H +#define PLUGINPROC_H // Qt includes. #include <QtCore/QObject> @@ -465,4 +465,4 @@ void error(bool keepGoing, const QString &msg); }; -#endif // _PLUGINPROC_H_ +#endif // PLUGINPROC_H Index: plugins/flite/fliteconf.h =================================================================== --- plugins/flite/fliteconf.h (revision 910110) +++ plugins/flite/fliteconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FLITECONF_H_ -#define _FLITECONF_H_ +#ifndef FLITECONF_H +#define FLITECONF_H // Qt includes. @@ -119,4 +119,4 @@ // Progress dialog. KProgressDialog* m_progressDlg; }; -#endif // _FLITECONF_H_ +#endif // FLITECONF_H Index: plugins/flite/fliteproc.h =================================================================== --- plugins/flite/fliteproc.h (revision 910110) +++ plugins/flite/fliteproc.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FLITEPROC_H_ -#define _FLITEPROC_H_ +#ifndef FLITEPROC_H +#define FLITEPROC_H // Qt includes. #include <QtCore/QMutex> @@ -183,4 +183,4 @@ bool m_waitingStop; }; -#endif // _FLITEPROC_H_ +#endif // FLITEPROC_H Index: plugins/epos/eposproc.h =================================================================== --- plugins/epos/eposproc.h (revision 910110) +++ plugins/epos/eposproc.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _EPOSPROC_H_ -#define _EPOSPROC_H_ +#ifndef EPOSPROC_H +#define EPOSPROC_H // Qt includes. #include <QtCore/QMutex> @@ -239,4 +239,4 @@ }; -#endif // _EPOSPROC_H_ +#endif // EPOSPROC_H Index: plugins/epos/eposconf.h =================================================================== --- plugins/epos/eposconf.h (revision 910110) +++ plugins/epos/eposconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _EPOSCONF_H_ -#define _EPOSCONF_H_ +#ifndef EPOSCONF_H +#define EPOSCONF_H // Qt includes. @@ -134,4 +134,4 @@ // List of displayed codec names. QStringList m_codecList; }; -#endif // _EPOSCONF_H_ +#endif // EPOSCONF_H Index: plugins/festivalint/festivalintconf.cpp =================================================================== --- plugins/festivalint/festivalintconf.cpp (revision 910110) +++ plugins/festivalint/festivalintconf.cpp (working copy) @@ -302,7 +302,7 @@ { for(index = 0 ; index < m_voiceList.count(); ++index) { - if (m_voiceList[index].name != i18n("Unknown")) + if (m_voiceList[index].name != i18nc("The voice is unknown", "Unknown")) { found = true; break; @@ -510,7 +510,7 @@ { voiceStruct voiceTemp; voiceTemp.code = code; - voiceTemp.name = i18n("Unknown"); + voiceTemp.name = i18nc("The voice is unknown", "Unknown"); voiceTemp.languageCode = m_languageCode; voiceTemp.codecName = "ISO 8858-1"; voiceTemp.gender = "neutral"; Index: plugins/festivalint/festivalintproc.h =================================================================== --- plugins/festivalint/festivalintproc.h (revision 910110) +++ plugins/festivalint/festivalintproc.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FESTIVALINTPROC_H_ -#define _FESTIVALINTPROC_H_ +#ifndef FESTIVALINTPROC_H +#define FESTIVALINTPROC_H #include <QtCore/QMutex> #include <QtCore/QStringList> @@ -358,4 +358,4 @@ SupportsSSML m_supportsSSML; }; -#endif // _FESTIVALINTPROC_H_ +#endif // FESTIVALINTPROC_H Index: plugins/festivalint/festivalintconf.h =================================================================== --- plugins/festivalint/festivalintconf.h (revision 910110) +++ plugins/festivalint/festivalintconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FESTIVALINTCONF_H_ -#define _FESTIVALINTCONF_H_ +#ifndef FESTIVALINTCONF_H +#define FESTIVALINTCONF_H // Qt includes. #include <QtCore/QList> @@ -180,4 +180,4 @@ // Whether Festival supports SSML or not. FestivalIntProc::SupportsSSML m_supportsSSML; }; -#endif // _FESTIVALINTCONF_H_ +#endif // FESTIVALINTCONF_H Index: plugins/freetts/freettsconfigwidget.ui =================================================================== --- plugins/freetts/freettsconfigwidget.ui (revision 910110) +++ plugins/freetts/freettsconfigwidget.ui (working copy) @@ -140,7 +140,7 @@ <item> <widget class="QPushButton" name="freettsTest" > <property name="text" > - <string>Test</string> + <string comment="Test the settings">Test</string> </property> </widget> </item> Index: plugins/freetts/freettsproc.h =================================================================== --- plugins/freetts/freettsproc.h (revision 910110) +++ plugins/freetts/freettsproc.h (working copy) @@ -16,8 +16,8 @@ * * ******************************************************************************/ -#ifndef _FREETTSPROC_H_ -#define _FREETTSPROC_H_ +#ifndef FREETTSPROC_H +#define FREETTSPROC_H #include <QtCore/QMutex> #include <QtCore/QStringList> @@ -175,5 +175,5 @@ bool m_waitingStop; }; -#endif // _FREETTSPROC_H_ +#endif // FREETTSPROC_H Index: plugins/freetts/freettsconf.h =================================================================== --- plugins/freetts/freettsconf.h (revision 910110) +++ plugins/freetts/freettsconf.h (working copy) @@ -16,8 +16,8 @@ * * ******************************************************************************/ -#ifndef _FREETTSCONF_H_ -#define _FREETTSCONF_H_ +#ifndef FREETTSCONF_H +#define FREETTSCONF_H // Qt includes. Index: plugins/hadifix/voicefileui.ui =================================================================== --- plugins/hadifix/voicefileui.ui (revision 910110) +++ plugins/hadifix/voicefileui.ui (working copy) @@ -54,14 +54,14 @@ <item row="0" column="0" > <widget class="QRadioButton" name="femaleOption" > <property name="text" > - <string>Female</string> + <string comment="Female, as option for gender">Female</string> </property> </widget> </item> <item row="0" column="1" > <widget class="QRadioButton" name="maleOption" > <property name="text" > - <string>Male</string> + <string comment="Male, as option for gender">Male</string> </property> </widget> </item> Index: plugins/hadifix/hadifixconf.cpp =================================================================== --- plugins/hadifix/hadifixconf.cpp (revision 910110) +++ plugins/hadifix/hadifixconf.cpp (working copy) @@ -206,7 +206,7 @@ QString s = stream.readLine().trimmed(); // look for a line "DATAPATH=..." - if (s.startsWith("DATAPATH")) { + if (s.startsWith(QString("DATAPATH"))) { s = s.mid(8, s.length()-8).trimmed(); if (s.startsWith('=')) { s = s.mid(1, s.length()-1).trimmed(); @@ -301,7 +301,7 @@ QTextStream stream(&file); if (!stream.atEnd()) { QString s = stream.readLine(); - if (s.startsWith("MBROLA")) + if (s.startsWith(QString("MBROLA"))) if (HadifixProc::determineGender(mbrolaExec, filename) != HadifixProc::NoVoice) result += filename; Index: plugins/hadifix/initialconfig.h =================================================================== --- plugins/hadifix/initialconfig.h (revision 910110) +++ plugins/hadifix/initialconfig.h (working copy) @@ -1,3 +1,19 @@ +/*************************************************************************** + begin : Mon Okt 14 2002 + copyright : (C) 2002 by Gunnar Schmi Dt + email : [email protected] + current mainainer: : Gary Cramblitt <[email protected]> + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + /** * Tries to find hadifix and mbrola by looking onto the hard disk. This is * necessary because both hadifix and mbrola do not have standard Index: plugins/hadifix/hadifixproc.h =================================================================== --- plugins/hadifix/hadifixproc.h (revision 910110) +++ plugins/hadifix/hadifixproc.h (working copy) @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef _HADIFIXPROC_H_ -#define _HADIFIXPROC_H_ +#ifndef HADIFIXPROC_H +#define HADIFIXPROC_H #include <QtCore/QStringList> Index: plugins/hadifix/hadifixconf.h =================================================================== --- plugins/hadifix/hadifixconf.h (revision 910110) +++ plugins/hadifix/hadifixconf.h (working copy) @@ -1,6 +1,22 @@ -#ifndef _HADIFIXCONF_H_ -#define _HADIFIXCONF_H_ +/*************************************************************************** + begin : Mon Okt 14 2002 + copyright : (C) 2002 by Gunnar Schmi Dt + email : [email protected] + current mainainer: : Gary Cramblitt <[email protected]> + ***************************************************************************/ +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef HADIFIXCONF_H +#define HADIFIXCONF_H + // Qt includes. // KTTS includes. Index: plugins/command/commandproc.h =================================================================== --- plugins/command/commandproc.h (revision 910110) +++ plugins/command/commandproc.h (working copy) @@ -17,8 +17,8 @@ * * ***************************************************************************/ -#ifndef _COMMANDPROC_H_ -#define _COMMANDPROC_H_ +#ifndef COMMANDPROC_H +#define COMMANDPROC_H // Qt includes. #include <QtCore/QStringList> @@ -199,4 +199,4 @@ bool m_waitingStop; }; -#endif // _COMMANDPROC_H_ +#endif // COMMANDPROC_H Index: plugins/command/commandconf.h =================================================================== --- plugins/command/commandconf.h (revision 910110) +++ plugins/command/commandconf.h (working copy) @@ -17,8 +17,8 @@ * * ***************************************************************************/ -#ifndef _COMMANDCONF_H_ -#define _COMMANDCONF_H_ +#ifndef COMMANDCONF_H +#define COMMANDCONF_H // Qt includes. @@ -116,4 +116,4 @@ // Codec list. QStringList m_codecList; }; -#endif // _COMMANDCONF_H_ +#endif // COMMANDCONF_H Index: kcmkttsmgr/kcmkttsd_testmessage.desktop =================================================================== --- kcmkttsmgr/kcmkttsd_testmessage.desktop (revision 910110) +++ kcmkttsmgr/kcmkttsd_testmessage.desktop (working copy) @@ -1,5 +1,7 @@ [Desktop Entry] NoDisplay=true +Type=Link + Name=The text-to-speech system seems to be functioning properly. Name[ar]=نظام نص-إلى-صوت يعمل بشكل جيد ظاهرياً. Name[bg]=Системата за синтез на глас изглежда, че функционира нормално. Index: kcmkttsmgr/kcmkttsmgrwidget.ui =================================================================== --- kcmkttsmgr/kcmkttsmgrwidget.ui (revision 910110) +++ kcmkttsmgr/kcmkttsmgrwidget.ui (working copy) @@ -22,7 +22,7 @@ </property> <widget class="QWidget" name="tab" > <attribute name="title" > - <string>General</string> + <string comment="General, as title of window">General</string> </attribute> <layout class="QGridLayout" > <item row="4" column="0" > Index: kcmkttsmgr/kcmkttsmgr.cpp =================================================================== --- kcmkttsmgr/kcmkttsmgr.cpp (revision 910110) +++ kcmkttsmgr/kcmkttsmgr.cpp (working copy) @@ -12,7 +12,8 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ @@ -329,7 +330,7 @@ m_sbdBtnEdit = sbdPopmenu->addAction( i18n("&Edit..."), this, SLOT(slotConfigureSbdFilterButton_clicked()), 0 ); m_sbdBtnUp = sbdPopmenu->addAction( KIcon("go-up"), - i18n("U&p"), this, SLOT(slotHigherSbdFilterPriorityButton_clicked()), 0 ); + i18nc("One slot up", "U&p"), this, SLOT(slotHigherSbdFilterPriorityButton_clicked()), 0 ); m_sbdBtnDown = sbdPopmenu->addAction( KIcon("go-down"), i18n("Do&wn"), this, SLOT(slotLowerSbdFilterPriorityButton_clicked()), 0 ); m_sbdBtnAdd = sbdPopmenu->addAction( @@ -613,7 +614,7 @@ } // Add "Other" language. - m_languagesToCodes[i18n("Other")] = "other"; + m_languagesToCodes[i18nc("Other language", "Other")] = "other"; // Load Filters. m_filterListModel.clear(); Index: kcmkttsmgr/addtalker.cpp =================================================================== --- kcmkttsmgr/addtalker.cpp (revision 910110) +++ kcmkttsmgr/addtalker.cpp (working copy) @@ -136,7 +136,7 @@ QString charSet; QString language; if (languageCode == "other") - language = i18n("Other"); + language = i18nc("Other language", "Other"); else { KGlobal::locale()->splitLocale(languageCode, langAlpha, countryCode, modifier, charSet); Index: kcmkttsmgr/kcmkttsd.desktop =================================================================== --- kcmkttsmgr/kcmkttsd.desktop (revision 910110) +++ kcmkttsmgr/kcmkttsd.desktop (working copy) @@ -1,5 +1,5 @@ [Desktop Entry] -Type=Service +Type=Application Exec=kcmshell4 kcmkttsd Icon=preferences-desktop-text-to-speech X-KDE-ServiceTypes=KCModule,KCModuleInit @@ -157,7 +157,5 @@ X-KDE-Keywords[x-test]=xxkttsd,kcmkttsmgr,kttsmgr,tts,ttsd,ktts,text,to,speech,speak,synthesizer,synth,festival,command,freetts,proklam,via,voicexx X-KDE-Keywords[zh_CN]=kttsd,kcmkttsmgr,kttsmgr,tts,ttsd,ktts,text,to,speech,speak,synthesizersynth,festival,command,freetts,proklam,via,voice,语音合成,文本,语音 -X-KDE-ParentApp=kcontrol X-KDE-SubstituteUID=false -X-KDE-Library=kcm_kttsd Terminal=false Index: kcmkttsmgr/kcmkttsmgr.h =================================================================== --- kcmkttsmgr/kcmkttsmgr.h (revision 910110) +++ kcmkttsmgr/kcmkttsmgr.h (working copy) @@ -12,7 +12,8 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ Index: kttsjobmgr/jobinfolistmodel.cpp =================================================================== --- kttsjobmgr/jobinfolistmodel.cpp (revision 910110) +++ kttsjobmgr/jobinfolistmodel.cpp (working copy) @@ -122,7 +122,7 @@ case 1: return i18n("Owner"); case 2: return i18n("Priority"); case 3: return i18n("Talker ID"); - case 4: return i18n("State"); + case 4: return i18nc("State of the section", "State"); case 5: return i18n("Position"); case 6: return i18n("Sentences"); }; @@ -197,12 +197,12 @@ { case KSpeech::jsQueued: return i18n("Queued"); case KSpeech::jsFiltering: return i18n("Filtering"); - case KSpeech::jsSpeakable: return i18n("Waiting"); + case KSpeech::jsSpeakable: return i18nc("Waiting for a job", "Waiting"); case KSpeech::jsSpeaking: return i18n("Speaking"); case KSpeech::jsPaused: return i18n("Paused"); case KSpeech::jsInterrupted: return i18n("Interrupted"); - case KSpeech::jsFinished: return i18n("Finished"); - default: return i18n("Unknown"); + case KSpeech::jsFinished: return i18nc("The job is finished", "Finished"); + default: return i18nc("The state is unknown", "Unknown"); } } @@ -215,12 +215,12 @@ { switch (priority) { - case KSpeech::jpAll: return i18n("All"); + case KSpeech::jpAll: return i18nc("Job priorty: All", "All"); case KSpeech::jpScreenReaderOutput: return i18n("Screen Reader"); - case KSpeech::jpWarning: return i18n("Warning"); + case KSpeech::jpWarning: return i18nc("Prioritylevel: warning", "Warning"); case KSpeech::jpMessage: return i18n("Message"); case KSpeech::jpText: return i18n("Text"); - default: return i18n("Unknown"); + default: return i18nc("Prioritylevel: unknown", "Unknown"); } } Index: kttsjobmgr/kttsjobmgr.cpp =================================================================== --- kttsjobmgr/kttsjobmgr.cpp (revision 910110) +++ kttsjobmgr/kttsjobmgr.cpp (working copy) @@ -170,7 +170,7 @@ "top speakable job in the list, it begins speaking.</p>"); btn->setWhatsThis(wt); connect (btn, SIGNAL(clicked()), this, SLOT(slot_job_resume())); - btn = new QPushButton(KIcon("edit-redo"), i18n("R&estart"), hbox1); + btn = new QPushButton(KIcon("edit-redo"), i18nc("Restart a job to the beginning", "R&estart"), hbox1); btn->setObjectName("job_restart"); wt = i18n( "<p>Rewinds a job to the beginning and changes its state to Waiting. If the job " Index: kttsjobmgr/kttsjobmgr.h =================================================================== --- kttsjobmgr/kttsjobmgr.h (revision 910110) +++ kttsjobmgr/kttsjobmgr.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _KTTSJOBMGRPART_H_ -#define _KTTSJOBMGRPART_H_ +#ifndef KTTSJOBMGRPART_H +#define KTTSJOBMGRPART_H // Qt includes @@ -191,4 +191,4 @@ virtual ~KttsJobMgrBrowserExtension(); }; -#endif // _KTTSJOBMGRPART_H_ +#endif // KTTSJOBMGRPART_H Index: kttsd/speaker.h =================================================================== --- kttsd/speaker.h (revision 910110) +++ kttsd/speaker.h (working copy) @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SPEAKER_H_ -#define _SPEAKER_H_ +#ifndef SPEAKER_H +#define SPEAKER_H // Qt includes. #include <QtCore/QObject> @@ -299,4 +299,4 @@ SpeakerPrivate* d; }; -#endif // _SPEAKER_H_ +#endif // SPEAKER_H Index: kttsd/filtermgr.h =================================================================== --- kttsd/filtermgr.h (revision 910110) +++ kttsd/filtermgr.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _FILTERMGR_H_ -#define _FILTERMGR_H_ +#ifndef FILTERMGR_H +#define FILTERMGR_H // Qt includes. #include <QtCore/QList> @@ -193,4 +193,4 @@ bool m_supportsHTML; }; -#endif // _FILTERMGR_H_ +#endif // FILTERMGR_H Index: kttsd/configdata.h =================================================================== --- kttsd/configdata.h (revision 910110) +++ kttsd/configdata.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _CONFIGDATA_H_ -#define _CONFIGDATA_H_ +#ifndef CONFIGDATA_H +#define CONFIGDATA_H // Qt includes. #include <QtCore/QMap> @@ -177,4 +177,4 @@ KConfig* m_config; }; -#endif +#endif // CONFIGDATA_H Index: kttsd/threadedplugin.h =================================================================== --- kttsd/threadedplugin.h (revision 910110) +++ kttsd/threadedplugin.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _THREADEDPLUGIN_H_ -#define _THREADEDPLUGIN_H_ +#ifndef THREADEDPLUGIN_H +#define THREADEDPLUGIN_H #include <QtCore/QThread> #include <QtCore/QMutex> @@ -340,4 +340,4 @@ ThreadedPlugInThread* m_ThreadedPluginThread; }; -#endif // _THREADEDPLUGIN_H_ +#endif // THREADEDPLUGIN_H Index: kttsd/speechdata.h =================================================================== --- kttsd/speechdata.h (revision 910110) +++ kttsd/speechdata.h (working copy) @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SPEECHDATA_H_ -#define _SPEECHDATA_H_ +#ifndef SPEECHDATA_H +#define SPEECHDATA_H // Qt includes. #include <QtCore/QByteArray> @@ -411,4 +411,4 @@ SpeechDataPrivate* d; }; -#endif // _SPEECHDATA_H_ +#endif // SPEECHDATA_H Index: kttsd/speechjob.h =================================================================== --- kttsd/speechjob.h (revision 910110) +++ kttsd/speechjob.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SPEECHJOB_H_ -#define _SPEECHJOB_H_ +#ifndef SPEECHJOB_H +#define SPEECHJOB_H // Qt includes. #include <QtCore/QList> @@ -146,4 +146,4 @@ SpeechJobPrivate* d; }; -#endif // _SPEECHJOB_H_ +#endif // SPEECHJOB_H Index: kttsd/appdata.h =================================================================== --- kttsd/appdata.h (revision 910110) +++ kttsd/appdata.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _APPDATA_H_ -#define _APPDATA_H_ +#ifndef APPDATA_H +#define APPDATA_H // Qt includes. #include <QtCore/QList> @@ -217,4 +217,4 @@ AppDataPrivate* d; }; -#endif +#endif // APPDATA_H Index: kttsd/utt.h =================================================================== --- kttsd/utt.h (revision 910110) +++ kttsd/utt.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _UTT_H_ -#define _UTT_H_ +#ifndef UTT_H +#define UTT_H // Qt includes. #include <QString> @@ -211,4 +211,4 @@ UttPrivate* d; }; -#endif +#endif // UTT_H Index: kttsd/ssmlconvert.h =================================================================== --- kttsd/ssmlconvert.h (revision 910110) +++ kttsd/ssmlconvert.h (working copy) @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef _SSMLCONVERT_H_ -#define _SSMLCONVERT_H_ +#ifndef SSMLCONVERT_H +#define SSMLCONVERT_H /** * SsmlConvert class: @@ -127,4 +127,4 @@ QString m_outFilename; }; -#endif // _SSMLCONVERT_H_ +#endif // SSMLCONVERT_H Index: kttsd/kspeech.h =================================================================== --- kttsd/kspeech.h (revision 910110) +++ kttsd/kspeech.h (working copy) @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ -#ifndef _KSPEECH_H_ -#define _KSPEECH_H_ +#ifndef KSPEECH_H +#define KSPEECH_H // Qt includes #include <QtCore/QObject> @@ -712,4 +712,4 @@ KSpeechPrivate* d; }; -#endif // _KSPEECH_H_ +#endif // KSPEECH_H Index: kttsd/speaker.cpp =================================================================== --- kttsd/speaker.cpp (revision 910110) +++ kttsd/speaker.cpp (working copy) @@ -692,14 +692,16 @@ QString sentence; Utt::uttType utType; KSpeech::JobPriority priority; - if (KSpeech::jpAll == requestedPriority) - foreach (priority, d->currentJobs.keys()) { + if (KSpeech::jpAll == requestedPriority) { + //As the variabele priority is used further on, we can't make it a reference type + foreach (priority, d->currentJobs.keys()){ //krazy:exclude=foreach d->currentJobs[priority] = d->speechData->getNextSpeakableJob(priority); if (d->currentJobs[priority]) sentence = d->currentJobs[priority]->getNextSentence(); if (!sentence.isEmpty()) break; - } + } + } else { priority = requestedPriority; d->currentJobs[priority] = d->speechData->getNextSpeakableJob(priority); Index: kttsd/talkermgr.h =================================================================== --- kttsd/talkermgr.h (revision 910110) +++ kttsd/talkermgr.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _TALKERMGR_H_ -#define _TALKERMGR_H_ +#ifndef TALKERMGR_H +#define TALKERMGR_H // Qt includes. #include <QtCore/QMap> @@ -159,4 +159,4 @@ mutable QMap<QString,int> m_talkerToPlugInCache; }; -#endif // _TALKERMGR_H_ +#endif // TALKERMGR_H Index: kttsmgr/kttsmgr.cpp =================================================================== --- kttsmgr/kttsmgr.cpp (revision 910110) +++ kttsmgr/kttsmgr.cpp (working copy) @@ -168,8 +168,8 @@ // To make it work on all platforms, would have to constantly monitor status and update, // which would suck up huge amounts of CPU. if (event->type() == QEvent::ToolTip) { - QString status = "<qt><b>KTTSMgr</b> - "; - status += i18n("<qt>Text-to-Speech Manager"); + QString status = "<qt><b>KTTSMgr</b> - <qt>"; + status += i18n("Text-to-Speech Manager"); status += "<br /><br />"; status += getStatus(); status += "</qt>"; @@ -244,11 +244,11 @@ switch( state ) { case KSpeech::jsQueued: return i18n("Queued"); - case KSpeech::jsSpeakable: return i18n("Waiting"); + case KSpeech::jsSpeakable: return i18nc("Waiting for an action", "Waiting"); case KSpeech::jsSpeaking: return i18n("Speaking"); case KSpeech::jsPaused: return i18n("Paused"); - case KSpeech::jsFinished: return i18n("Finished"); - default: return i18n("Unknown"); + case KSpeech::jsFinished: return i18nc("Finished the job", "Finished"); + default: return i18nc("State is unknown", "Unknown"); } } Index: app-plugins/kate/katekttsd.cpp =================================================================== --- app-plugins/kate/katekttsd.cpp (revision 910110) +++ app-plugins/kate/katekttsd.cpp (working copy) @@ -22,11 +22,11 @@ #include "katekttsd.moc" // Qt includes. -#include <QtGui/QMessageBox> #include <QtCore/QTimer> #include <QtDBus/QtDBus> // KDE includes. +#include <kmessagebox.h> #include <ktexteditor/editinterface.h> #include <ktexteditor/selectioninterface.h> #include <kaction.h> @@ -95,16 +95,16 @@ { QString error; if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error)) - QMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); + KMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); } QDBusInterface kttsd( "org.kde.KSpeech", "/KSpeech", "org.kde.KSpeech" ); QDBusReply<bool> reply = kttsd.call("setText", text,""); if ( !reply.isValid()) - QMessageBox::warning( 0, i18n( "D-Bus Call Failed" ), + KMessageBox::warning( 0, i18n( "D-Bus Call Failed" ), i18n( "The D-Bus call setText failed." )); reply = kttsd.call("startText", 0); if ( !reply.isValid()) - QMessageBox::warning( 0, i18n( "D-Bus Call Failed" ), + KMessageBox::warning( 0, i18n( "D-Bus Call Failed" ), i18n( "The D-Bus call startText failed." )); } Index: app-plugins/kate/katekttsd.h =================================================================== --- app-plugins/kate/katekttsd.h (revision 910110) +++ app-plugins/kate/katekttsd.h (working copy) @@ -17,8 +17,8 @@ * * ***************************************************************************/ -#ifndef _KATEKTTSD_H_ -#define _KATEKTTSD_H_ +#ifndef KATEKTTSD_H +#define KATEKTTSD_H #include <ktexteditor/plugin.h> #include <ktexteditor/view.h> @@ -55,4 +55,4 @@ void slotReadOut(); }; -#endif // _KATEKTTSD_H_ +#endif // KATEKTTSD_H Index: filters/xmltransformer/xmltransformerconf.h =================================================================== --- filters/xmltransformer/xmltransformerconf.h (revision 910110) +++ filters/xmltransformer/xmltransformerconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _XMLTRANSFORMERCONF_H_ -#define _XMLTRANSFORMERCONF_H_ +#ifndef XMLTRANSFORMERCONF_H +#define XMLTRANSFORMERCONF_H // Qt includes. #include <QtGui/QWidget> @@ -115,4 +115,4 @@ private: }; -#endif //_XMLTRANSFORMERCONF_H_ +#endif //XMLTRANSFORMERCONF_H Index: filters/xmltransformer/xmltransformerproc.h =================================================================== --- filters/xmltransformer/xmltransformerproc.h (revision 910110) +++ filters/xmltransformer/xmltransformerproc.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _XMLTRANSFORMERPROC_H_ -#define _XMLTRANSFORMERPROC_H_ +#ifndef XMLTRANSFORMERPROC_H +#define XMLTRANSFORMERPROC_H // Qt includes. #include <QtCore/QObject> @@ -164,4 +164,4 @@ bool m_wasModified; }; -#endif // _XMLTRANSFORMERPROC_H_ +#endif // XMLTRANSFORMERPROC_H Index: filters/stringreplacer/stringreplacerconf.h =================================================================== --- filters/stringreplacer/stringreplacerconf.h (revision 910110) +++ filters/stringreplacer/stringreplacerconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _STRINGREPLACERCONF_H_ -#define _STRINGREPLACERCONF_H_ +#ifndef STRINGREPLACERCONF_H +#define STRINGREPLACERCONF_H // Qt includes. #include <QtGui/QWidget> @@ -156,4 +156,4 @@ QStringList m_languageCodeList; }; -#endif //_STRINGREPLACERCONF_H_ +#endif //STRINGREPLACERCONF_H Index: filters/stringreplacer/stringreplacerproc.h =================================================================== --- filters/stringreplacer/stringreplacerproc.h (revision 910110) +++ filters/stringreplacer/stringreplacerproc.h (working copy) @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _STRINGREPLACERPROC_H_ -#define _STRINGREPLACERPROC_H_ +#ifndef STRINGREPLACERPROC_H +#define STRINGREPLACERPROC_H // Qt includes. #include <QtCore/QObject> @@ -91,4 +91,4 @@ bool m_wasModified; }; -#endif // _STRINGREPLACERPROC_H_ +#endif // STRINGREPLACERPROC_H Index: filters/stringreplacer/stringreplacerconfwidget.ui =================================================================== --- filters/stringreplacer/stringreplacerconfwidget.ui (revision 910110) +++ filters/stringreplacer/stringreplacerconfwidget.ui (working copy) @@ -181,7 +181,7 @@ <string>Click to load a word list from a file.</string> </property> <property name="text" > - <string>Load</string> + <string comment="Load a word list from a file">Load</string> </property> </widget> </item> @@ -217,7 +217,7 @@ <string>Click to empty the word list.</string> </property> <property name="text" > - <string>Clear</string> + <string comment="Clear the word list">Clear</string> </property> </widget> </item> Index: filters/stringreplacer/stringreplacerconf.cpp =================================================================== --- filters/stringreplacer/stringreplacerconf.cpp (revision 910110) +++ filters/stringreplacer/stringreplacerconf.cpp (working copy) @@ -236,7 +236,7 @@ (wordType=="RegExp"?i18nc("Abbreviation for 'Regular Expression'", "RegExp"):i18n("Word")); int tableRow = substLView->rowCount(); QString matchCaseStr = - (matchCase=="Yes"?i18n("Yes"):i18n("No")); + (matchCase=="Yes"?i18nc("Yes or no", "Yes"):i18nc("Yes or no", "No")); substLView->setRowCount( tableRow + 1 ); substLView->setItem( tableRow, 0, new QTableWidgetItem( wordTypeStr ) ); substLView->setItem( tableRow, 1, new QTableWidgetItem( matchCaseStr ) ); @@ -335,7 +335,7 @@ propTag = doc.createElement( "case" ); wordTag.appendChild( propTag); t = doc.createTextNode( - substLView->item(row, 2)->text()==i18n("Yes")?"Yes":"No" ); + substLView->item(row, 2)->text()==i18nc("Yes or no", "Yes")?"Yes":"No" ); propTag.appendChild( t ); propTag = doc.createElement( "match" ); @@ -578,7 +578,7 @@ m_editWidget->regexpRadioButton->setChecked( true ); m_editWidget->matchButton->setEnabled( m_reEditorInstalled ); } - if ( substLView->item(row, 1)->text() == i18n("Yes") ) + if ( substLView->item(row, 1)->text() == i18nc("Yes or no", "Yes") ) m_editWidget->matchCaseCheckBox->setChecked( true ); m_editWidget->matchLineEdit->setText( substLView->item(row, 2)->text() ); m_editWidget->substLineEdit->setText( substLView->item(row, 3)->text() ); @@ -606,7 +606,7 @@ QString substType = i18n( "Word" ); if ( m_editWidget->regexpRadioButton->isChecked() ) substType = i18nc("Abbreviation for 'Regular Expression'", "RegExp"); - QString matchCase = m_editWidget->matchCaseCheckBox->isChecked()?i18n("Yes"):i18n("No"); + QString matchCase = m_editWidget->matchCaseCheckBox->isChecked()?i18nc("Yes or no", "Yes"):i18nc("Yes or no", "No"); QString match = m_editWidget->matchLineEdit->text(); QString subst = m_editWidget->substLineEdit->text(); delete m_editDlg; Index: filters/talkerchooser/talkerchooserproc.h =================================================================== --- filters/talkerchooser/talkerchooserproc.h (revision 910110) +++ filters/talkerchooser/talkerchooserproc.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _TALKERCHOOSERPROC_H_ -#define _TALKERCHOOSERPROC_H_ +#ifndef TALKERCHOOSERPROC_H +#define TALKERCHOOSERPROC_H // Qt includes. #include <QtCore/QObject> @@ -88,4 +88,4 @@ TalkerCode m_chosenTalkerCode; }; -#endif // _TALKERCHOOSERPROC_H_ +#endif // TALKERCHOOSERPROC_H Index: filters/talkerchooser/talkerchooserconf.h =================================================================== --- filters/talkerchooser/talkerchooserconf.h (revision 910110) +++ filters/talkerchooser/talkerchooserconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _TALKERCHOOSERCONF_H_ -#define _TALKERCHOOSERCONF_H_ +#ifndef TALKERCHOOSERCONF_H +#define TALKERCHOOSERCONF_H // Qt includes. #include <QtGui/QWidget> @@ -127,4 +127,4 @@ TalkerCode m_talkerCode; }; -#endif //_TALKERCHOOSERCONF_H_ +#endif //TALKERCHOOSERCONF_H Index: filters/main.cpp =================================================================== --- filters/main.cpp (revision 910110) +++ filters/main.cpp (working copy) @@ -1,9 +1,26 @@ -/********************** - #FILENAME: #FILEDESC - #COPYRIGHTNOTICE - #LICENSE -***********************/ +/****************************************************************************** + /Filter main. + ------------------- + Copyright: + (C) 2005 by Gary Cramblitt <[email protected]> + ------------------- + Original author: Gary Cramblitt <[email protected]> + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ******************************************************************************/ + #include <QtCore/QTextStream> #include <kapplication.h> @@ -23,7 +40,7 @@ KAboutData aboutdata( "testfilter", 0, ki18n("testfilter"), "0.1.0", ki18n("A utility for testing KTTSD filter plugins."), - KAboutData::License_GPL, ki18n("Copyright 2005, Gary Cramblitt <[email protected]>")); + KAboutData::License_GPL, ki18n("Copyright 2005, Gary Cramblitt <[email protected]>")); aboutdata.addAuthor(ki18n("Gary Cramblitt"), ki18n("Maintainer"),"[email protected]"); KCmdLineArgs::init( argc, argv, &aboutdata ); Index: filters/sbd/sbdproc.h =================================================================== --- filters/sbd/sbdproc.h (revision 910110) +++ filters/sbd/sbdproc.h (working copy) @@ -42,8 +42,8 @@ ******************************************************************************/ -#ifndef _SBDPROC_H_ -#define _SBDPROC_H_ +#ifndef SBDPROC_H +#define SBDPROC_H // Qt includes. #include <QtCore/QObject> @@ -363,4 +363,4 @@ QString m_configuredRe; }; -#endif // _SBDPROC_H_ +#endif // SBDPROC_H Index: filters/sbd/sbdconf.h =================================================================== --- filters/sbd/sbdconf.h (revision 910110) +++ filters/sbd/sbdconf.h (working copy) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -#ifndef _SBDCONF_H_ -#define _SBDCONF_H_ +#ifndef SBDCONF_H +#define SBDCONF_H // Qt includes. #include <QtGui/QWidget> @@ -130,4 +130,4 @@ QStringList m_languageCodeList; }; -#endif //_SBDCONF_H_ +#endif //SBDCONF_H Index: filters/xhtml2ssml/xmlelement.h =================================================================== --- filters/xhtml2ssml/xmlelement.h (revision 910110) +++ filters/xhtml2ssml/xmlelement.h (working copy) @@ -14,7 +14,8 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ Index: filters/xhtml2ssml/xhtml2ssml.h =================================================================== --- filters/xhtml2ssml/xhtml2ssml.h (revision 910110) +++ filters/xhtml2ssml/xhtml2ssml.h (working copy) @@ -14,14 +14,15 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ -#ifndef _XHTML2SSML_H_ -#define _XHTML2SSML_H_ +#ifndef XHTML2SSML_H +#define XHTML2SSML_H -#include <QtXml> +#include <QtXml/QXmlAttributes> #include <QtCore/QMap> typedef QMap<QString, QString> QStringMap; @@ -57,4 +58,4 @@ QString m_output; }; -#endif +#endif //XHTML2SSML_H Index: filters/xhtml2ssml/main.cpp =================================================================== --- filters/xhtml2ssml/main.cpp (revision 910110) +++ filters/xhtml2ssml/main.cpp (working copy) @@ -1,7 +1,27 @@ +/**************************************************************************** + XHTMLToSSMLParser class + Parses a piece of XHTML markup and converts into SSML. + ------------------- + Copyright: + (C) 2004 by Paul Giannaros <[email protected]> + ------------------- + Original author: Paul Giannaros <[email protected]> +******************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + #include <QtGui/QApplication> #include <QtCore/QFile> -#include <QtXml> +#include <QtXml/QXmlInputSource> +#include <QtXml/QXmlSimpleReader> #include <QtCore/QMap> #include <iostream> #include "xhtml2ssml.h" Index: filters/xhtml2ssml/xmlelement.cpp =================================================================== --- filters/xhtml2ssml/xmlelement.cpp (revision 910110) +++ filters/xhtml2ssml/xmlelement.cpp (working copy) @@ -14,7 +14,8 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ @@ -79,7 +80,7 @@ } XMLElement XMLElement::fromQString(const QString &str) { - QStringList sections = str.split( " "); + QStringList sections = str.split( ' '); QString tagname = sections[0]; XMLElement e(tagname.latin1()); @@ -88,7 +89,7 @@ if(sections.count()) { const int sectionsCount = sections.count(); for(int i = 0; i < sectionsCount; ++i) { - QStringList list = sections[i].split( "="); + QStringList list = sections[i].split( '='); if(list.count() != 2) { std::cerr << "XMLElement::fromQString: Cannot convert list: " << list.join("|") << ". `" << str << "' is not in valid format.\n"; return XMLElement(" "); Index: filters/xhtml2ssml/xhtml2ssml.cpp =================================================================== --- filters/xhtml2ssml/xhtml2ssml.cpp (revision 910110) +++ filters/xhtml2ssml/xhtml2ssml.cpp (working copy) @@ -1,5 +1,3 @@ - - /**************************************************************************** XHTMLToSSMLParser class @@ -15,18 +13,20 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * * * ***************************************************************************/ -#include <QtXml> +#include "xhtml2ssml.h" + +#include <QtXml/QXmlAttributes> #include <QtCore/QFile> #include <QtCore/QTextStream> #include <iostream> #include "xmlelement.h" -#include "xhtml2ssml.h" /// Document parsing begin. Init stuff here. bool XHTMLToSSMLParser::startDocument() { @@ -96,7 +96,7 @@ // break into QStringList // the second parameter to split is the string, with all space simplified and all space around the : removed, i.e // "something : somethingelse" -> "something:somethingelse" - QStringList keyvalue = QString( ":").replace(":").split( ":", line.simplified().replace(" :", ":")); + QStringList keyvalue = QString( ':').replace(':').split( ':', line.simplified().replace(' :', ':')); if(keyvalue.count() != 2) return false; m_xhtml2ssml[keyvalue[0]] = keyvalue[1]; Index: kspeak/kspeak.cpp =================================================================== --- kspeak/kspeak.cpp (revision 910110) +++ kspeak/kspeak.cpp (working copy) @@ -350,11 +350,11 @@ const QMetaObject *mo = m_kspeech->metaObject(); if (member.isEmpty()) { - *m_out << i18n("Enter HELP <option> where <option> may be:") << endl; + *m_out << i18n("Enter HELP <option> where <option> may be:") << endl; *m_out << i18n(" COMMANDS to list local commands understood by kspeak.") << endl; *m_out << i18n(" SIGNALS to list KTTSD signals sent via D-Bus.") << endl; *m_out << i18n(" MEMBERS to list all commands that may be sent to KTTSD via D-Bus.") << endl; - *m_out << i18n(" <member> to show a single command that may be sent to KTTSD via D-Bus.") << endl; + *m_out << i18n(" <member> to show a single command that may be sent to KTTSD via D-Bus.") << endl; *m_out << i18n("Options may be entered in lower- or uppercase. Examples:") << endl; *m_out << i18n(" help commands") << endl; *m_out << i18n(" help say") << endl; @@ -369,7 +369,7 @@ *m_out << "SET REPLIES OFF " << i18n("Do not display KTTSD return values.") << endl; *m_out << "SET SIGNALS ON " << i18n("Display signals emitted by KTTSD.") << endl; *m_out << "SET SIGNALS OFF " << i18n("Do not display KTTSD signals.") << endl; - *m_out << "SET WTIMEOUT <msec> " << i18n("Set the WAIT timeout to <msec> milliseconds. 0 waits forever.") << endl; + *m_out << "SET WTIMEOUT <msec> " << i18n("Set the WAIT timeout to <msec> milliseconds. 0 waits forever.") << endl; *m_out << "BUFFERBEGIN " << i18n("Start filling a buffer.") << endl; *m_out << "BUFFEREND " << i18n("Stop filling buffer.") << endl; *m_out << i18n(" Example buffer usage:") << endl; @@ -378,9 +378,9 @@ *m_out << " for Linux and Unix workstations." << endl; *m_out << " BUFFEREND" << endl; *m_out << " say \"$(mybuf)\" 0" << endl; - *m_out << "PAUSE <msec> " << i18n("Pause <msec> milliseconds. Example") << endl; + *m_out << "PAUSE <msec> " << i18n("Pause <msec> milliseconds. Example") << endl; *m_out << " pause 500" << endl; - *m_out << "WAIT <signal> <args> " << i18n("Wait for <signal> with (optional) <args> arguments. Example:") << endl; + *m_out << "WAIT <signal> <args> " << i18n("Wait for <signal> with (optional) <args> arguments. Example:") << endl; *m_out << " set wtimeout 5000" << endl; *m_out << " wait marker" << endl; } else if ("MEMBERS" == member.toUpper()) { @@ -427,13 +427,13 @@ { case KSpeech::jsQueued: return i18n("Queued"); case KSpeech::jsFiltering: return i18n("Filtering"); - case KSpeech::jsSpeakable: return i18n("Waiting"); + case KSpeech::jsSpeakable: return i18nc("Waiting for a job", "Waiting"); case KSpeech::jsSpeaking: return i18n("Speaking"); case KSpeech::jsPaused: return i18n("Paused"); case KSpeech::jsInterrupted: return i18n("Interrupted"); - case KSpeech::jsFinished: return i18n("Finished"); - case KSpeech::jsDeleted: return i18n("Deleted"); - default: return i18n("Unknown"); + case KSpeech::jsFinished: return i18nc("Finished the job", "Finished"); + case KSpeech::jsDeleted: return i18nc("Deleted the job", "Deleted"); + default: return i18nc("Job state unknown", "Unknown"); } } @@ -529,7 +529,7 @@ QStringList KSpeak::dbusReplyToStringList(const QDBusMessage& reply, const QString& cmd) { QStringList sl; - foreach (QVariant v, reply.arguments()) { + foreach (QVariant v, reply.arguments()) { //krazy:exclude=foreach if (QVariant::StringList == v.userType()) { sl.append(v.toStringList().join(",")); } else { @@ -621,8 +621,8 @@ } else { // Look for assignment statement. left = right - QString left = line.section("=", 0, 0).trimmed(); - QString right = line.section("=", 1).trimmed(); + QString left = line.section('=', 0, 0).trimmed(); + QString right = line.section('=', 1).trimmed(); // kDebug() << "left = right: " << left << " = " << right; if (right.isEmpty()) { right = left; @@ -631,8 +631,8 @@ // Obtain command, which is first word, and arguments that follow. // cmd arg arg... - QString cmd = right.section(" ", 0, 0).trimmed(); - QString args = right.section(" ", 1).trimmed(); + QString cmd = right.section(' ', 0, 0).trimmed(); + QString args = right.section(' ', 1).trimmed(); // kDebug() << "cmd: " << cmd << " args: " << args; // Variable substitution. @@ -663,8 +663,8 @@ m_vars["_BUF"].clear(); } else if ("SET" == ucCmd) { QString ucArgs = args.toUpper(); - QString property = ucArgs.section(" ", 0, 0).trimmed(); - QString value = ucArgs.section(" ", 1).trimmed(); + QString property = ucArgs.section(' ', 0, 0).trimmed(); + QString value = ucArgs.section(' ', 1).trimmed(); bool onOff = ("ON" == value) ? true : false; if ("ECHO" == property) m_echo = onOff; Index: kspeak/main.cpp =================================================================== --- kspeak/main.cpp (revision 910110) +++ kspeak/main.cpp (working copy) @@ -44,7 +44,7 @@ KAboutData aboutdata( "kspeak", 0, ki18n("kspeak"), "0.1.0", ki18n("A utility for sending speech commands to KTTSD service via D-Bus."), - KAboutData::License_GPL, ki18n("Copyright 2006, Gary Cramblitt <[email protected]>")); + KAboutData::License_GPL, ki18n("Copyright 2006, Gary Cramblitt <[email protected]>")); aboutdata.addAuthor(ki18n("Gary Cramblitt"), ki18n("Maintainer"),"[email protected]"); KCmdLineArgs::init(argc, argv, &aboutdata);