From 15838c5216a01413dbb95b0c5b30001c553d2c9f Mon Sep 17 00:00:00 2001 From: mlaurent Date: Sat, 1 Oct 2005 12:43:59 +0000 Subject: [PATCH] byebye q3vbox git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeaccessibility@466054 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kttsd/filters/sbd/sbdconf.cpp | 5 +++-- kttsd/filters/stringreplacer/stringreplacerconf.cpp | 7 ++++--- kttsd/kttsjobmgr/kttsjobmgr.cpp | 21 +++++++++++---------- kttsd/kttsjobmgr/kttsjobmgr.h | 5 +++-- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 748237cd..68e897c4 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -25,7 +25,7 @@ #include #include #include -#include + #include #include #include @@ -47,6 +47,7 @@ #include #include #include +#include // KTTS includes. #include "filterconf.h" @@ -235,7 +236,7 @@ void SbdConf::slotReButton_clicked() void SbdConf::slotLanguageBrowseButton_clicked() { // Create a QHBox to host KListView. - Q3HBox* hBox = new Q3HBox(m_widget, "SelectLanguage_hbox"); + KHBox* hBox = new KHBox(m_widget/*, "SelectLanguage_hbox"*/); // Create a KListView and fill with all known languages. KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 6afe4893..1bd94f98 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -25,7 +25,7 @@ #include #include #include -#include + #include #include #include @@ -49,6 +49,7 @@ #include #include #include +#include // KTTS includes. #include "filterconf.h" @@ -420,7 +421,7 @@ QString StringReplacerConf::substitutionTypeToString(const int substitutionType) void StringReplacerConf::slotLanguageBrowseButton_clicked() { // Create a QHBox to host KListView. - Q3HBox* hBox = new Q3HBox(m_widget, "SelectLanguage_hbox"); + KHBox* hBox = new KHBox(m_widget/*, "SelectLanguage_hbox"*/); // Create a KListView and fill with all known languages. KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); @@ -566,7 +567,7 @@ void StringReplacerConf::addOrEditSubstitution(bool isAdd) if (!item) return; } // Create a QHBox to host widget. - Q3HBox* hBox = new Q3HBox(m_widget, "AddOrEditSubstitution_hbox" ); + KHBox* hBox = new KHBox(m_widget/*, "AddOrEditSubstitution_hbox"*/ ); // Create widget. m_editWidget = new EditReplacementWidget( hBox, "AddOrEditSubstitution_widget" ); // Set controls if editing existing. diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index a22dcbc3..82695eb0 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ // QT includes. -#include -#include + + #include #include #include @@ -39,6 +39,7 @@ #include #include #include +#include // KTTS includes. #include "kspeech.h" @@ -113,8 +114,8 @@ KttsJobMgrPart::KttsJobMgrPart(QWidget *parent, const char *name) : KGlobal::locale()->insertCatalogue("kttsd"); // Create a QVBox to host everything. - Q3VBox* vBox = new Q3VBox(parent); - vBox->setMargin(6); + KVBox* vBox = new KVBox(parent); + //vBox->setMargin(6); // Create a splitter to contain the Job List View and the current sentence. QSplitter* splitter = new QSplitter(vBox); @@ -160,18 +161,18 @@ KttsJobMgrPart::KttsJobMgrPart(QWidget *parent, const char *name) : // splitter->setResizeMode(m_jobListView, QSplitter::Stretch); // Create a VBox to hold buttons and current sentence. - Q3VBox* bottomBox = new Q3VBox(splitter); + KVBox* bottomBox = new KVBox(splitter); // Create a box to hold buttons. - m_buttonBox = new Q3VBox(bottomBox); + m_buttonBox = new KVBox(bottomBox); m_buttonBox->setSpacing(6); // Create 3 HBoxes to host buttons. - Q3HBox* hbox1 = new Q3HBox(m_buttonBox); + KHBox* hbox1 = new KHBox(m_buttonBox); hbox1->setSpacing(6); - Q3HBox* hbox2 = new Q3HBox(m_buttonBox); + KHBox* hbox2 = new KHBox(m_buttonBox); hbox2->setSpacing(6); - Q3HBox* hbox3 = new Q3HBox(m_buttonBox); + KHBox* hbox3 = new KHBox(m_buttonBox); hbox3->setSpacing(6); // Do not let button box stretch vertically. @@ -282,7 +283,7 @@ KttsJobMgrPart::KttsJobMgrPart(QWidget *parent, const char *name) : enableJobPartActions(false); // Create a VBox for the current sentence and sentence label. - Q3VBox* sentenceVBox = new Q3VBox(bottomBox); + KVBox* sentenceVBox = new KVBox(bottomBox); // Create a label for current sentence. QLabel* currentSentenceLabel = new QLabel(sentenceVBox); diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index d95db40d..4e60f768 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -24,6 +24,7 @@ // KDE includes. #include #include +#include // KTTS includes. #include "kspeech_stub.h" @@ -34,7 +35,7 @@ class KInstance; class KttsJobMgrBrowserExtension; class KListView; class Q3ListViewItem; -class Q3VBox; +class KVBox; class KTextEdit; class KttsJobMgrFactory : public KLibFactory @@ -274,7 +275,7 @@ private: /** * Box containing buttons. */ - Q3VBox* m_buttonBox; + KVBox* m_buttonBox; /** * This flag is set to True whenever we want to select the next job that -- 2.11.4.GIT