diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:09:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:09:56 -0600 |
commit | 5ca50f0ef6000d132b45fc6a50cf3062245bd070 (patch) | |
tree | 99c6b7de89d289e0a80ec21f7525dc514bc759d1 /kttsd | |
parent | 722a076e84b860a947f4c68417db82526b03b1a1 (diff) | |
download | tdeaccessibility-5ca50f0ef6000d132b45fc6a50cf3062245bd070.tar.gz tdeaccessibility-5ca50f0ef6000d132b45fc6a50cf3062245bd070.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kttsd')
-rw-r--r-- | kttsd/app-plugins/kate/katekttsd.cpp | 2 | ||||
-rw-r--r-- | kttsd/filters/sbd/sbdconf.cpp | 12 | ||||
-rw-r--r-- | kttsd/filters/stringreplacer/stringreplacerconf.cpp | 20 | ||||
-rw-r--r-- | kttsd/filters/stringreplacer/stringreplacerconfwidget.ui | 2 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 50 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.h | 8 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 8 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/selectevent.cpp | 8 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/selecteventwidget.ui | 2 | ||||
-rw-r--r-- | kttsd/kttsjobmgr/kttsjobmgr.cpp | 4 | ||||
-rw-r--r-- | kttsd/kttsjobmgr/kttsjobmgr.h | 4 | ||||
-rw-r--r-- | kttsd/libkttsd/selecttalkerdlg.cpp | 16 | ||||
-rw-r--r-- | kttsd/libkttsd/selecttalkerwidget.ui | 2 |
13 files changed, 69 insertions, 69 deletions
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index 7354f7f..21f2ee6 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -74,7 +74,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n view->insertChildClient( this ); setInstance( KGenericFactory<KateKttsdPlugin>::instance() ); TDEGlobal::locale()->insertCatalogue("kttsd"); - (void) new KAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); + (void) new TDEAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); setXMLFile( "tdetexteditor_kttsdui.rc" ); } diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 5b1fb6d..3b32764 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -232,10 +232,10 @@ void SbdConf::slotReButton_clicked() void SbdConf::slotLanguageBrowseButton_clicked() { - // Create a TQHBox to host KListView. + // Create a TQHBox to host TDEListView. TQHBox* hBox = new TQHBox(m_widget, "SelectLanguage_hbox"); - // Create a KListView and fill with all known languages. - KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); + // Create a TDEListView and fill with all known languages. + TDEListView* langLView = new TDEListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); langLView->setSelectionMode(TQListView::Extended); @@ -246,7 +246,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() TQString charSet; TQString language; // Blank line so user can select no language. - TQListViewItem* item = new KListViewItem(langLView, "", ""); + TQListViewItem* item = new TDEListViewItem(langLView, "", ""); if (m_languageCodeList.isEmpty()) item->setSelected(true); const int allLocalesCount = allLocales.count(); for (int ndx=0; ndx < allLocalesCount; ++ndx) @@ -256,7 +256,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode); if (!countryCode.isEmpty()) language += " (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; - TQListViewItem* item = new KListViewItem(langLView, language, locale); + TQListViewItem* item = new TDEListViewItem(langLView, language, locale); if (m_languageCodeList.contains(locale)) item->setSelected(true); } // Sort by language. @@ -288,7 +288,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and TQHBox? + // TODO: Also delete TDEListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 95e4f51..b27fdb0 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -239,9 +239,9 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) TQString matchCaseStr = (matchCase=="Yes"?i18n("Yes"):i18n("No")); if (!item) - item = new KListViewItem(m_widget->substLView, wordTypeStr, matchCaseStr, match, subst); + item = new TDEListViewItem(m_widget->substLView, wordTypeStr, matchCaseStr, match, subst); else - item = new KListViewItem(m_widget->substLView, item, wordTypeStr, matchCaseStr, match, subst); + item = new TDEListViewItem(m_widget->substLView, item, wordTypeStr, matchCaseStr, match, subst); } return TQString(); @@ -417,10 +417,10 @@ TQString StringReplacerConf::userPlugInName() void StringReplacerConf::slotLanguageBrowseButton_clicked() { - // Create a TQHBox to host KListView. + // Create a TQHBox to host TDEListView. TQHBox* hBox = new TQHBox(m_widget, "SelectLanguage_hbox"); - // Create a KListView and fill with all known languages. - KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); + // Create a TDEListView and fill with all known languages. + TDEListView* langLView = new TDEListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); langLView->setSelectionMode(TQListView::Extended); @@ -431,7 +431,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() TQString charSet; TQString language; // Blank line so user can select no language. - TQListViewItem* item = new KListViewItem(langLView, "", ""); + TQListViewItem* item = new TDEListViewItem(langLView, "", ""); if (m_languageCodeList.isEmpty()) item->setSelected(true); const int allLocalesCount = allLocales.count(); for (int ndx=0; ndx < allLocalesCount; ++ndx) @@ -441,7 +441,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode); if (!countryCode.isEmpty()) language += " (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; - item = new KListViewItem(langLView, language, locale); + item = new TDEListViewItem(langLView, language, locale); if (m_languageCodeList.contains(locale)) item->setSelected(true); } // Sort by language. @@ -473,7 +473,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and TQHBox? + // TODO: Also delete TDEListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) @@ -620,9 +620,9 @@ void StringReplacerConf::addOrEditSubstitution(bool isAdd) if ( isAdd ) { if ( item ) - item = new KListViewItem( m_widget->substLView, item, substType, matchCase, match, subst ); + item = new TDEListViewItem( m_widget->substLView, item, substType, matchCase, match, subst ); else - item = new KListViewItem( m_widget->substLView, substType, matchCase, match, subst ); + item = new TDEListViewItem( m_widget->substLView, substType, matchCase, match, subst ); m_widget->substLView->setSelected( item, true ); } else diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui index d18b541..305cd6e 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui +++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui @@ -249,7 +249,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Type</string> diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index ff7f1f2..8b84a12 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -511,10 +511,10 @@ void KCMKttsMgr::load() { // kdDebug() << "KCMKttsMgr::load: talkerCode = " << talkerCode << endl; if (talkerItem) - talkerItem = new KListViewItem(m_kttsmgrw->talkersList, talkerItem, + talkerItem = new TDEListViewItem(m_kttsmgrw->talkersList, talkerItem, talkerID, language, synthName); else - talkerItem = new KListViewItem(m_kttsmgrw->talkersList, + talkerItem = new TDEListViewItem(m_kttsmgrw->talkersList, talkerID, language, synthName); updateTalkerItem(talkerItem, talkerCode); m_languagesToCodes[language] = fullLanguageCode; @@ -595,10 +595,10 @@ void KCMKttsMgr::load() { filterItem = m_kttsmgrw->sbdsList->lastChild(); if (!filterItem) - filterItem = new KListViewItem(m_kttsmgrw->sbdsList, + filterItem = new TDEListViewItem(m_kttsmgrw->sbdsList, userFilterName, filterID, filterPlugInName); else - filterItem = new KListViewItem(m_kttsmgrw->sbdsList, filterItem, + filterItem = new TDEListViewItem(m_kttsmgrw->sbdsList, filterItem, userFilterName, filterID, filterPlugInName); } else { filterItem = m_kttsmgrw->filtersList->lastChild(); @@ -650,10 +650,10 @@ void KCMKttsMgr::load() { filterItem = m_kttsmgrw->sbdsList->lastChild(); if (!filterItem) - filterItem = new KListViewItem(m_kttsmgrw->sbdsList, + filterItem = new TDEListViewItem(m_kttsmgrw->sbdsList, userFilterName, filterID, filterPlugInName); else - filterItem = new KListViewItem(m_kttsmgrw->sbdsList, filterItem, + filterItem = new TDEListViewItem(m_kttsmgrw->sbdsList, filterItem, userFilterName, filterID, filterPlugInName); } else { filterItem = m_kttsmgrw->filtersList->lastChild(); @@ -1236,10 +1236,10 @@ void KCMKttsMgr::slot_addTalker() // If user chose "Other", must now get a language from him. if(languageCode == "other") { - // Create a TQHBox to host KListView. + // Create a TQHBox to host TDEListView. TQHBox* hBox = new TQHBox(m_kttsmgrw, "SelectLanguage_hbox"); - // Create a KListView and fill with all known languages. - KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); + // Create a TDEListView and fill with all known languages. + TDEListView* langLView = new TDEListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha(); @@ -1252,7 +1252,7 @@ void KCMKttsMgr::slot_addTalker() { locale = allLocales[ndx]; language = TalkerCode::languageCodeToLanguage(locale); - new KListViewItem(langLView, language, locale); + new TDEListViewItem(langLView, language, locale); } // Sort by language. langLView->setSorting(0); @@ -1274,7 +1274,7 @@ void KCMKttsMgr::slot_addTalker() languageCode = TQString(); if (langLView->selectedItem()) languageCode = langLView->selectedItem()->text(1); delete dlg; - // TODO: Also delete KListView and TQHBox? + // TODO: Also delete TDEListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; } @@ -1342,10 +1342,10 @@ void KCMKttsMgr::slot_addTalker() // Add listview item. TQListViewItem* talkerItem = m_kttsmgrw->talkersList->lastChild(); if (talkerItem) - talkerItem = new KListViewItem(m_kttsmgrw->talkersList, talkerItem, + talkerItem = new TDEListViewItem(m_kttsmgrw->talkersList, talkerItem, TQString::number(m_lastTalkerID), language, synthName); else - talkerItem = new KListViewItem(m_kttsmgrw->talkersList, + talkerItem = new TDEListViewItem(m_kttsmgrw->talkersList, TQString::number(m_lastTalkerID), language, synthName); // Set additional columns of the listview item. @@ -1391,7 +1391,7 @@ void KCMKttsMgr:: slot_addSbdFilter() void KCMKttsMgr::addFilter( bool sbd) { // Build a list of filters that support multiple instances and let user choose. - KListView* lView = m_kttsmgrw->filtersList; + TDEListView* lView = m_kttsmgrw->filtersList; if (sbd) lView = m_kttsmgrw->sbdsList; TQStringList filterPlugInNames; @@ -1506,9 +1506,9 @@ void KCMKttsMgr::addFilter( bool sbd) if (sbd) { if (filterItem) - filterItem = new KListViewItem( lView, filterItem, userFilterName ); + filterItem = new TDEListViewItem( lView, filterItem, userFilterName ); else - filterItem = new KListViewItem( lView, userFilterName ); + filterItem = new TDEListViewItem( lView, userFilterName ); } else { @@ -1591,7 +1591,7 @@ void KCMKttsMgr::removeFilter( bool sbd ) { // kdDebug() << "KCMKttsMgr::removeFilter: Running"<< endl; - KListView* lView = m_kttsmgrw->filtersList; + TDEListView* lView = m_kttsmgrw->filtersList; if (sbd) lView = m_kttsmgrw->sbdsList; // Get the selected filter. TQListViewItem *itemToRemove = lView->selectedItem(); @@ -1634,7 +1634,7 @@ void KCMKttsMgr::slot_higherSbdFilterPriority() /** * This is called whenever user clicks the Up button. */ -void KCMKttsMgr::higherItemPriority( KListView* lView ) +void KCMKttsMgr::higherItemPriority( TDEListView* lView ) { TQListViewItem* item = lView->selectedItem(); if (!item) return; @@ -1667,7 +1667,7 @@ void KCMKttsMgr::slot_lowerSbdFilterPriority() /** * This is called whenever user clicks the Down button. */ -void KCMKttsMgr::lowerItemPriority( KListView* lView ) +void KCMKttsMgr::lowerItemPriority( TDEListView* lView ) { TQListViewItem* item = lView->selectedItem(); if (!item) return; @@ -1954,7 +1954,7 @@ void KCMKttsMgr::slot_configureSbdFilter() void KCMKttsMgr::configureFilterItem( bool sbd ) { // Get highlighted plugin from Filter ListView and load into memory. - KListView* lView = m_kttsmgrw->filtersList; + TDEListView* lView = m_kttsmgrw->filtersList; if (sbd) lView = m_kttsmgrw->sbdsList; TQListViewItem* filterItem = lView->selectedItem(); if (!filterItem) return; @@ -2296,7 +2296,7 @@ TQString KCMKttsMgr::saveNotifyEventsToFile(const TQString& filename) doc.appendChild( root ); // Events. - KListView* lv = m_kttsmgrw->notifyListView; + TDEListView* lv = m_kttsmgrw->notifyListView; TQListViewItemIterator it(lv); while ( it.current() ) { @@ -2519,7 +2519,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( const TQString& message, TalkerCode& talkerCode) { - KListView* lv = m_kttsmgrw->notifyListView; + TDEListView* lv = m_kttsmgrw->notifyListView; TQListViewItem* item = 0; TQString iconName; TQString eventSrcName; @@ -2548,10 +2548,10 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( { item = lv->lastItem(); if (!item) - parentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(), + parentItem = new TDEListViewItem(lv, eventSrcName, TQString(), TQString(), eventSrc); else - parentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(), + parentItem = new TDEListViewItem(lv, item, eventSrcName, TQString(), TQString(), eventSrc); if ( !iconName.isEmpty() ) parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); @@ -2559,7 +2559,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( // No duplicates. item = lv->findItem( event, nlvcEvent ); if ( !item || item->parent() != parentItem ) - item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, + item = new TDEListViewItem(parentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) item->setPixmap( nlvcActionName, SmallIcon( "nospeak" ) ); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index e95dc9c..ab7b818 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -39,7 +39,7 @@ class PlugInConf; class KttsFilterConf; -class KListViewItem; +class TDEListViewItem; class TDEAboutData; class TDEConfig; class TQPopupMenu; @@ -272,10 +272,10 @@ class KCMKttsMgr : void removeFilter( bool sbd ); /** - * Move an item in a KListView up or down. + * Move an item in a TDEListView up or down. */ - void lowerItemPriority( KListView* lView ); - void higherItemPriority( KListView* lView ); + void lowerItemPriority( TDEListView* lView ); + void higherItemPriority( TDEListView* lView ); /** * Count number of configured Filters with the specified plugin name. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index 87d36f5..f183ed8 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -199,7 +199,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>ID</string> @@ -446,7 +446,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="1" column="0"> + <widget class="TDEListView" row="1" column="0"> <column> <property name="text"> <string>Application/Event</string> @@ -824,7 +824,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Filter</string> @@ -994,7 +994,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Sentence Boundary Detector</string> diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 35a3ff6..89341de 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -102,9 +102,9 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ), config->readEntry( TQString::fromLatin1( "Name" ))); if ( !item ) - item = new KListViewItem( eventsListView, eventDesc, eventName ); + item = new TDEListViewItem( eventsListView, eventDesc, eventName ); else - item = new KListViewItem( eventsListView, item, eventDesc, eventName ); + item = new TDEListViewItem( eventsListView, item, eventDesc, eventName ); } } delete config; @@ -112,9 +112,9 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) item = eventsListView->lastChild(); TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText()); if ( !item ) - item = new KListViewItem( eventsListView, eventDesc, "default" ); + item = new TDEListViewItem( eventsListView, eventDesc, "default" ); else - item = new KListViewItem( eventsListView, item, eventDesc, "default" ); + item = new TDEListViewItem( eventsListView, item, eventDesc, "default" ); } diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui index 6f5e910..01dffeb 100644 --- a/kttsd/kcmkttsmgr/selecteventwidget.ui +++ b/kttsd/kcmkttsmgr/selecteventwidget.ui @@ -32,7 +32,7 @@ <cstring>eventSrcComboBox</cstring> </property> </widget> - <widget class="KListView" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Events</string> diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index 19e5a1a..9c8cf76 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -109,8 +109,8 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : splitter->setOrientation(Qt::Vertical); // Create Job List View widget. - m_jobListView = new KListView(splitter, "joblistview"); - m_jobListView->setSelectionModeExt(KListView::Single); + m_jobListView = new TDEListView(splitter, "joblistview"); + m_jobListView->setSelectionModeExt(TDEListView::Single); m_jobListView->addColumn(i18n("Job Num")); m_jobListView->addColumn(i18n("Owner")); m_jobListView->addColumn(i18n("Talker ID")); diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index 43c1188..1d5381d 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -29,7 +29,7 @@ class TDEAboutData; class TDEInstance; class KttsJobMgrBrowserExtension; -class KListView; +class TDEListView; class TQListViewItem; class TQVBox; class KTextEdit; @@ -262,7 +262,7 @@ private: /** * Job ListView. */ - KListView* m_jobListView; + TDEListView* m_jobListView; KttsJobMgrBrowserExtension *m_extension; /** diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 0a63269..af6da4c 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -159,10 +159,10 @@ TQString SelectTalkerDlg::getSelectedTranslatedDescription() void SelectTalkerDlg::slotLanguageBrowseButton_clicked() { - // Create a TQHBox to host KListView. + // Create a TQHBox to host TDEListView. TQHBox* hBox = new TQHBox(m_widget, "SelectLanguage_hbox"); - // Create a KListView and fill with all known languages. - KListView* langLView = new KListView(hBox, "SelectLanguage_lview"); + // Create a TDEListView and fill with all known languages. + TDEListView* langLView = new TDEListView(hBox, "SelectLanguage_lview"); langLView->addColumn(i18n("Language")); langLView->addColumn(i18n("Code")); langLView->setSelectionMode(TQListView::Single); @@ -171,14 +171,14 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked() TQString language; // Blank line so user can select no language. // Note: Don't use TQString(), which gets displayed at bottom of list, rather than top. - TQListViewItem* item = new KListViewItem(langLView, "", ""); + TQListViewItem* item = new TDEListViewItem(langLView, "", ""); if (m_talkerCode.languageCode().isEmpty()) item->setSelected(true); int allLocalesCount = allLocales.count(); for (int ndx=0; ndx < allLocalesCount; ++ndx) { locale = allLocales[ndx]; language = TalkerCode::languageCodeToLanguage(locale); - item = new KListViewItem(langLView, language, locale); + item = new TDEListViewItem(langLView, language, locale); if (m_talkerCode.fullLanguageCode() == locale) item->setSelected(true); } // Sort by language. @@ -258,7 +258,7 @@ void SelectTalkerDlg::applyTalkerCodeToControls() // Select closest matching specific Talker. int talkerIndex = TalkerCode::findClosestMatchingTalker(m_talkers, m_talkerCode.getTalkerCode(), false); - KListView* lv = m_widget->talkersListView; + TDEListView* lv = m_widget->talkersListView; TQListViewItem* item = lv->firstChild(); if ( item ) { @@ -314,7 +314,7 @@ void SelectTalkerDlg::applyControlsToTalkerCode() void SelectTalkerDlg::loadTalkers(bool /*runningTalkers*/) { m_talkers.clear(); - KListView* lv = m_widget->talkersListView; + TDEListView* lv = m_widget->talkersListView; lv->clear(); TQListViewItem* item; TDEConfig* config = new TDEConfig("kttsdrc"); @@ -334,7 +334,7 @@ void SelectTalkerDlg::loadTalkers(bool /*runningTalkers*/) TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString()); TQString synthName = TalkerCode::TalkerDesktopEntryNameToName(desktopEntryName); // Display in List View using translated strings. - item = new KListViewItem(lv, item); + item = new TDEListViewItem(lv, item); TQString fullLanguageCode = talker.fullLanguageCode(); TQString language = TalkerCode::languageCodeToLanguage(fullLanguageCode); item->setText(tlvcLanguage, language); diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui index be55d45..9b76283 100644 --- a/kttsd/libkttsd/selecttalkerwidget.ui +++ b/kttsd/libkttsd/selecttalkerwidget.ui @@ -449,7 +449,7 @@ </size> </property> </spacer> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Language</string> |