From 7edb10b7064578eb8320b5063f9b99ebc975ea83 Mon Sep 17 00:00:00 2001
From: mlaurent <mlaurent@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 3 Dec 2005 12:23:24 +0000
Subject: [PATCH] Fix some error

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeaccessibility@485213 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmouth/optionsdialog.cpp | 10 ++++++----
 kmouth/phraselist.cpp    |  1 +
 kmouth/speech.cpp        |  3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index b516bf78..bfe62ada 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -120,7 +120,9 @@ OptionsDialog::OptionsDialog (QWidget *parent)
    setHelp ("config-dialog");
 
    QPixmap iconGeneral = KGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
-   Q3Grid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), QString::null, iconGeneral);
+   KHBox *pageGeneral = addHBoxPage( i18n("General Options"), QString::null, iconGeneral);
+   
+	   //addGridPage (1, Qt::Horizontal, i18n("General Options"), QString::null, iconGeneral);
    
    tabCtl = new QTabWidget (pageGeneral, "general");
 
@@ -133,13 +135,13 @@ OptionsDialog::OptionsDialog (QWidget *parent)
    tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
    
    QPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
-   Q3Grid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), QString::null, iconCompletion);
+   KHBox *pageCompletion = addHBoxPage (i18n("Word Completion"), QString::null, iconCompletion);
    completionWidget = new WordCompletionWidget(pageCompletion, "Word Completion widget");
 
    kttsd = loadKttsd();
    if (kttsd != 0) {
       QPixmap iconKttsd = KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
-      Q3Grid *pageKttsd = addGridPage (1, Qt::Horizontal, i18n("KTTSD Speech Service"),
+      KHBox *pageKttsd = addHBoxPage (i18n("KTTSD Speech Service"),
                                       i18n("KDE Text-to-Speech Daemon Configuration"), iconKttsd);
       
       kttsd->reparent(pageKttsd,0,QPoint(0,0),true);
@@ -218,7 +220,7 @@ KCModule *OptionsDialog::loadKttsd () {
          // Reuse "lib" instead of letting createInstanceFromLibrary recreate it
          KLibFactory *factory = lib->factory();
          if (factory != 0) {
-            KCModule *module = KLibFactory::create<KCModule> (factory);
+            KCModule *module = factory->create<KCModule> (factory);
             if (module)
                 return module;
          }
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 42c4a6c9..513a4478 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -37,6 +37,7 @@
 #include <kfiledialog.h>
 #include <kcombobox.h>
 #include <kmessagebox.h>
+#include <kxmlguifactory.h>
 
 #include <stdlib.h>
 
diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp
index 2cc87261..7a787de2 100644
--- a/kmouth/speech.cpp
+++ b/kmouth/speech.cpp
@@ -23,6 +23,7 @@
 #include <qregexp.h>
 #include <qtextcodec.h>
 #include <qfile.h>
+#include <QHash>
 //Added by qt3to4:
 #include <QTextStream>
 #include <kdebug.h>
@@ -40,7 +41,7 @@ Speech::~Speech() {
 QString Speech::prepareCommand (QString command, const QString &text,
                           const QString &filename, const QString &language) {
 #ifdef macroExpander
-   QMap<QChar,QString> map;
+   QHash<QChar,QString> map;
    map['t'] = text;
    map['f'] = filename;
    map['l'] = language;
-- 
2.11.4.GIT