Rename a number of classes to enhance compatibility with KDE4

5 files changed, 38 insertions, 38 deletions

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>