diff options
Diffstat (limited to 'kttsd/kcmkttsmgr')
-rw-r--r-- | kttsd/kcmkttsmgr/addtalkerwidget.ui | 2 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 20 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 2 | ||||
-rw-r--r-- | kttsd/kcmkttsmgr/selecteventwidget.ui | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui index a3cc11d..4769c21 100644 --- a/kttsd/kcmkttsmgr/addtalkerwidget.ui +++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui @@ -252,7 +252,7 @@ <tabstop>synthesizerSelection</tabstop> <tabstop>languageRadioButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 50c6f58..f4d2bbe 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -2543,23 +2543,23 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( TQString talkerName = talkerCode.getTranslatedDescription(); if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty()) { - TQListViewItem* tqparentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName); - if (!tqparentItem) + TQListViewItem* parentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName); + if (!parentItem) { item = lv->lastItem(); if (!item) - tqparentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(), + parentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(), eventSrc); else - tqparentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(), + parentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(), eventSrc); if ( !iconName.isEmpty() ) - tqparentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); + parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); } // No duplicates. item = lv->tqfindItem( event, nlvcEvent ); - if ( !item || item->tqparent() != tqparentItem ) - item = new KListViewItem(tqparentItem, eventName, actionDisplayName, talkerName, + if ( !item || item->tqparent() != parentItem ) + item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) item->setPixmap( nlvcActionName, SmallIcon( "nospeak" ) ); @@ -2644,11 +2644,11 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked() { TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem(); if (!item) return; - TQListViewItem* tqparentItem = item->tqparent(); + TQListViewItem* parentItem = item->tqparent(); delete item; - if (tqparentItem) + if (parentItem) { - if (tqparentItem->childCount() == 0) delete tqparentItem; + if (parentItem->childCount() == 0) delete parentItem; } slotNotifyListView_selectionChanged(); configChanged(); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index ab66ca2..b5c7a6b 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -1894,7 +1894,7 @@ <Q_SLOTS> <slot access="private">slotConfigChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="6"/> +<layoutdefaults spacing="6" margin="6"/> <includehints> <includehint>kcmodule.h</includehint> <includehint>klistview.h</includehint> diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui index ece6a71..6f5e910 100644 --- a/kttsd/kcmkttsmgr/selecteventwidget.ui +++ b/kttsd/kcmkttsmgr/selecteventwidget.ui @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> |