diff options
Diffstat (limited to 'kttsd/kcmkttsmgr')
| -rw-r--r-- | kttsd/kcmkttsmgr/addtalker.cpp | 10 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/addtalker.h | 7 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/addtalkerwidget.ui | 32 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 102 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgr.h | 13 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 202 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h | 2 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/selectevent.cpp | 32 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/selectevent.h | 7 | ||||
| -rw-r--r-- | kttsd/kcmkttsmgr/selecteventwidget.ui | 8 |
10 files changed, 209 insertions, 206 deletions
diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index 4a94cf3..5732372 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqradiobutton.h> // KDE includes. @@ -34,8 +34,8 @@ // KTTS includes. #include "addtalker.h" -AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char* name, WFlags fl) - : AddTalkerWidget(parent,name,fl) +AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const char* name, WFlags fl) + : AddTalkerWidget(tqparent,name,fl) { // Build maps. setSynthToLangMap(synthToLangMap); @@ -46,7 +46,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char // Default to user's desktop language. TQString languageCode = KGlobal::locale()->defaultLanguage(); // If there is not a synth that supports the locale, try stripping country code. - if (!m_langToSynthMap.contains(languageCode)) + if (!m_langToSynthMap.tqcontains(languageCode)) { TQString countryCode; TQString charSet; @@ -55,7 +55,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char languageCode = twoAlpha; } // If there is still not a synth that supports the language code, default to "other". - if (!m_langToSynthMap.contains(languageCode)) languageCode = "other"; + if (!m_langToSynthMap.tqcontains(languageCode)) languageCode = "other"; // Select the language in the language combobox. TQString language = languageCodeToLanguage(languageCode); diff --git a/kttsd/kcmkttsmgr/addtalker.h b/kttsd/kcmkttsmgr/addtalker.h index 33b9ba8..0c3f703 100644 --- a/kttsd/kcmkttsmgr/addtalker.h +++ b/kttsd/kcmkttsmgr/addtalker.h @@ -25,7 +25,7 @@ #ifndef ADDTALKER_H #define ADDTALKER_H -// Qt includes. +// TQt includes. #include <tqmap.h> #include "addtalkerwidget.h" @@ -36,15 +36,16 @@ typedef TQMap<TQString,TQStringList> LangToSynthMap; class AddTalker : public AddTalkerWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * @param synthToLangMap TQMap of supported language codes indexed by synthesizer. - * @param parent Inherited KDialog parameter. + * @param tqparent Inherited KDialog parameter. * @param name Inherited KDialog parameter. */ - AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui index f493138..a3cc11d 100644 --- a/kttsd/kcmkttsmgr/addtalkerwidget.ui +++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddTalkerWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddTalkerWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -80,21 +80,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>351</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>synthesizerLabel</cstring> </property> <property name="text"> <string>&Synthesizer:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -166,14 +166,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>showAllLabel</cstring> </property> @@ -185,21 +185,21 @@ <property name="text"> <string>Show All</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> <string>The radio buttons below determine which box shows all possibilities. The box to the left of the checked button shows all possibilities. The box to the left of the unchecked box only shows those possibilities that match the other box.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>languageLabel</cstring> </property> <property name="text"> <string>&Language:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -210,7 +210,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QRadioButton" row="1" column="3"> + <widget class="TQRadioButton" row="1" column="3"> <property name="name"> <cstring>languageRadioButton</cstring> </property> @@ -227,7 +227,7 @@ <string>Check to list all the possible languages in the Language box at the left. When a language has been chosen, the Synthesizer box will show only those synthesizers that can speak in the chosen language.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="3"> + <widget class="TQRadioButton" row="2" column="3"> <property name="name"> <cstring>synthesizerRadioButton</cstring> </property> @@ -252,7 +252,7 @@ <tabstop>synthesizerSelection</tabstop> <tabstop>languageRadioButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 b8cf367..50c6f58 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -23,7 +23,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqwidget.h> #include <tqtabwidget.h> #include <tqcheckbox.h> @@ -104,10 +104,10 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kttsd, KCMKttsMgrFactory("kttsd") ) * Makes the list of plug ins. * And the languages acording to the plug ins. */ -KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) : +KCMKttsMgr::KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kcmkttsmgr_kspeechsink"), - KCModule(KCMKttsMgrFactory::instance(), parent, name) + KCModule(KCMKttsMgrFactory::instance(), tqparent, name) { // kdDebug() << "KCMKttsMgr contructor running." << endl; @@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) m_suppressConfigChanged = false; // Add the KTTS Manager widget - TQGridLayout *layout = new TQGridLayout(this, 0, 0); + TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0); m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw"); // m_kttsmgrw = new KCMKttsMgrWidget(this); - layout->addWidget(m_kttsmgrw, 0, 0); + tqlayout->addWidget(m_kttsmgrw, 0, 0); // Give buttons icons. // Talkers tab. @@ -430,7 +430,7 @@ void KCMKttsMgr::load() loadNotifyEventsFromFile( locateLocal("config", "kttsd_notifyevents.xml"), true ); slotNotifyEnableCheckBox_toggled( m_kttsmgrw->notifyEnableCheckBox->isChecked() ); // Auto-expand and position on the Default item. - TQListViewItem* item = m_kttsmgrw->notifyListView->findItem( "default", nlvcEventSrc ); + TQListViewItem* item = m_kttsmgrw->notifyListView->tqfindItem( "default", nlvcEventSrc ); if ( item ) if ( item->childCount() > 0 ) item = item->firstChild(); if ( item ) m_kttsmgrw->notifyListView->ensureItemVisible( item ); @@ -491,7 +491,7 @@ void KCMKttsMgr::load() TQString fullLanguageCode; talkerCode = TalkerCode::normalizeTalkerCode(talkerCode, fullLanguageCode); TQString language = TalkerCode::languageCodeToLanguage(fullLanguageCode); - TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString()); // If a DesktopEntryName is not in the config file, it was configured before // we started using them, when we stored translated plugin names instead. // Try to convert the translated plugin name to a DesktopEntryName. @@ -500,7 +500,7 @@ void KCMKttsMgr::load() TQString synthName; if (desktopEntryName.isEmpty()) { - synthName = m_config->readEntry("PlugIn", TQString::null); + synthName = m_config->readEntry("PlugIn", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = TalkerCode::TalkerNameToDesktopEntryName(synthName); // Record the DesktopEntryName from now on. @@ -542,7 +542,7 @@ void KCMKttsMgr::load() // All plugins support "Other". // TODO: Eventually, this should not be necessary, since all plugins will know // the languages they support and report them in call to getSupportedLanguages(). - if (!languageCodes.contains("other")) languageCodes.append("other"); + if (!languageCodes.tqcontains("other")) languageCodes.append("other"); // Add supported language codes to synthesizer-to-language map. m_synthToLangMap[synthName] = languageCodes; @@ -568,7 +568,7 @@ void KCMKttsMgr::load() TQString filterID = *it; // kdDebug() << "KCMKttsMgr::load: filterID = " << filterID << endl; m_config->setGroup("Filter_" + filterID); - TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString()); // If a DesktopEntryName is not in the config file, it was configured before // we started using them, when we stored translated plugin names instead. // Try to convert the translated plugin name to a DesktopEntryName. @@ -577,7 +577,7 @@ void KCMKttsMgr::load() TQString filterPlugInName; if (desktopEntryName.isEmpty()) { - filterPlugInName = m_config->readEntry("PlugInName", TQString::null); + filterPlugInName = m_config->readEntry("PlugInName", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = FilterNameToDesktopEntryName(filterPlugInName); // Record the DesktopEntryName from now on. @@ -822,7 +822,7 @@ void KCMKttsMgr::save() if (groupName.left(7) == "Talker_") { TQString groupTalkerID = groupName.mid(7); - if (!talkerIDsList.contains(groupTalkerID)) m_config->deleteGroup(groupName); + if (!talkerIDsList.tqcontains(groupTalkerID)) m_config->deleteGroup(groupName); } } @@ -862,7 +862,7 @@ void KCMKttsMgr::save() if (groupName.left(7) == "Filter_") { TQString groupFilterID = groupName.mid(7); - if (!filterIDsList.contains(groupFilterID)) m_config->deleteGroup(groupName); + if (!filterIDsList.tqcontains(groupFilterID)) m_config->deleteGroup(groupName); } } @@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin", - TQString("DesktopEntryName == '%1'").arg(name)); + TQString("DesktopEntryName == '%1'").tqarg(name)); if (offers.count() == 1) { @@ -1144,7 +1144,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").arg(plugInName)); + TQString("DesktopEntryName == '%1'").tqarg(plugInName)); if (offers.count() == 1) { @@ -1271,10 +1271,10 @@ void KCMKttsMgr::slot_addTalker() dlg->setHelp("select-plugin", "kttsd"); dlg->setInitialSize(TQSize(200, 500), false); dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (langLView->selectedItem()) languageCode = langLView->selectedItem()->text(1); delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; } @@ -1400,7 +1400,7 @@ void KCMKttsMgr::addFilter( bool sbd) { if (item->text(flvcMultiInstance) == "T") { - if (!filterPlugInNames.contains(item->text(flvcPlugInName))) + if (!filterPlugInNames.tqcontains(item->text(flvcPlugInName))) filterPlugInNames.append(item->text(flvcPlugInName)); } item = item->nextSibling(); @@ -1835,7 +1835,7 @@ void KCMKttsMgr::kttsdStarted() if (factory) { // Create the Job Manager part - m_jobMgrPart = (KParts::ReadOnlyPart *)factory->create( m_kttsmgrw->mainTab, "kttsjobmgr", + m_jobMgrPart = (KParts::ReadOnlyPart *)factory->create( TQT_TQOBJECT(m_kttsmgrw->mainTab), "kttsjobmgr", "KParts::ReadOnlyPart" ); if (m_jobMgrPart) { @@ -2063,7 +2063,7 @@ void KCMKttsMgr::configureTalker() } float audioStretchFactor = 1.0/(float(m_kttsmgrw->timeBox->value())/100.0); // kdDebug() << "KCMKttsMgr::configureTalker: playerOption = " << playerOption << " audioStretchFactor = " << audioStretchFactor << " sink name = " << sinkName << endl; - TestPlayer* testPlayer = new TestPlayer(this, "ktts_testplayer", + TestPlayer* testPlayer = new TestPlayer(TQT_TQOBJECT(this), "ktts_testplayer", playerOption, audioStretchFactor, sinkName); m_loadedTalkerPlugIn->setPlayer(testPlayer); // Display the dialog. @@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter() true, true); m_configDlg->setInitialSize(TQSize(600, 450), false); - m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint()); + m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint()); m_loadedFilterPlugIn->show(); m_configDlg->setMainWidget(m_loadedFilterPlugIn); m_configDlg->setHelp("configure-filter", "kttsd"); @@ -2201,15 +2201,15 @@ void KCMKttsMgr::slotFiltersList_stateChanged() * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ TQString KCMKttsMgr::FilterNameToDesktopEntryName(const TQString& name) { - if (name.isEmpty()) return TQString::null; + if (name.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin"); for (uint ndx = 0; ndx < offers.count(); ++ndx) if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName(); - return TQString::null; + return TQString(); } /** @@ -2219,14 +2219,14 @@ TQString KCMKttsMgr::FilterNameToDesktopEntryName(const TQString& name) */ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryName) { - if (desktopEntryName.isEmpty()) return TQString::null; + if (desktopEntryName.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); + TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); if (offers.count() == 1) return offers[0]->name(); else - return TQString::null; + return TQString(); } /** @@ -2278,7 +2278,7 @@ TQString KCMKttsMgr::loadNotifyEventsFromFile( const TQString& filename, bool cl addNotifyItem(eventSrc, event, NotifyAction::action( actionName ), message, talkerCode); } - return TQString::null; + return TQString(); } /** @@ -2347,7 +2347,7 @@ TQString KCMKttsMgr::saveNotifyEventsToFile(const TQString& filename) ts << doc.toString(); file.close(); - return TQString::null; + return TQString(); } void KCMKttsMgr::slotNotifyEnableCheckBox_toggled(bool checked) @@ -2396,7 +2396,7 @@ void KCMKttsMgr::slotNotifyListView_selectionChanged() bool defaultItem = ( item->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyRemoveButton->setEnabled( !defaultItem ); } else { - bool defaultItem = ( item->parent()->text(nlvcEventSrc) == "default" ); + bool defaultItem = ( item->tqparent()->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyPresentComboBox->setEnabled( defaultItem ); if ( defaultItem ) m_kttsmgrw->notifyPresentComboBox->setCurrentItem( NotifyPresent::present( item->text( nlvcEvent ) ) ); @@ -2482,9 +2482,9 @@ void KCMKttsMgr::slotNotifyTestButton_clicked() break; case NotifyAction::SpeakCustom: msg = m_kttsmgrw->notifyMsgLineEdit->text(); - msg.replace("%a", i18n("sample application")); - msg.replace("%e", i18n("sample event")); - msg.replace("%m", i18n("sample notification message")); + msg.tqreplace("%a", i18n("sample application")); + msg.tqreplace("%e", i18n("sample event")); + msg.tqreplace("%m", i18n("sample notification message")); break; } if (!msg.isEmpty()) sayMessage(msg, item->text(nlvcTalker)); @@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( else { if (event == "default") - eventName = i18n("All other %1 events").arg(eventSrcName); + eventName = i18n("All other %1 events").tqarg(eventSrcName); else eventName = NotifyEvent::getEventName(eventSrc, event); } @@ -2543,23 +2543,23 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( TQString talkerName = talkerCode.getTranslatedDescription(); if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty()) { - TQListViewItem* parentItem = lv->findItem(eventSrcName, nlvcEventSrcName); - if (!parentItem) + TQListViewItem* tqparentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName); + if (!tqparentItem) { item = lv->lastItem(); if (!item) - parentItem = new KListViewItem(lv, eventSrcName, TQString::null, TQString::null, + tqparentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(), eventSrc); else - parentItem = new KListViewItem(lv, item, eventSrcName, TQString::null, TQString::null, + tqparentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(), eventSrc); if ( !iconName.isEmpty() ) - parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); + tqparentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); } // No duplicates. - item = lv->findItem( event, nlvcEvent ); - if ( !item || item->parent() != parentItem ) - item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, + item = lv->tqfindItem( event, nlvcEvent ); + if ( !item || item->tqparent() != tqparentItem ) + item = new KListViewItem(tqparentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) item->setPixmap( nlvcActionName, SmallIcon( "nospeak" ) ); @@ -2599,7 +2599,7 @@ void KCMKttsMgr::slotNotifyAddButton_clicked() int action = NotifyAction::DoNotSpeak; TQString msg; TalkerCode talkerCode; - item = lv->findItem( "default", nlvcEventSrc ); + item = lv->tqfindItem( "default", nlvcEventSrc ); if ( item ) { if ( item->childCount() > 0 ) item = item->firstChild(); @@ -2631,7 +2631,7 @@ void KCMKttsMgr::slotNotifyClearButton_clicked() TQString("default"), NotifyPresent::presentName(NotifyPresent::Passive), NotifyAction::SpeakEventName, - TQString::null, + TQString(), talkerCode ); TQListView* lv = m_kttsmgrw->notifyListView; lv->ensureItemVisible( item ); @@ -2644,11 +2644,11 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked() { TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem(); if (!item) return; - TQListViewItem* parentItem = item->parent(); + TQListViewItem* tqparentItem = item->tqparent(); delete item; - if (parentItem) + if (tqparentItem) { - if (parentItem->childCount() == 0) delete parentItem; + if (tqparentItem->childCount() == 0) delete tqparentItem; } slotNotifyListView_selectionChanged(); configChanged(); @@ -2688,16 +2688,16 @@ void KCMKttsMgr::slotNotifySaveButton_clicked() // ---------------------------------------------------------------------------- -KttsCheckListItem::KttsCheckListItem( TQListView *parent, TQListViewItem *after, +KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(parent, after, text, tt), + TQCheckListItem(tqparent, after, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } -KttsCheckListItem::KttsCheckListItem( TQListView *parent, +KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(parent, text, tt), + TQCheckListItem(tqparent, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } /*virtual*/ void KttsCheckListItem::stateChange(bool) diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index 0fc4141..5edb02e 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -21,7 +21,7 @@ #include "config.h" -// Qt includes. +// TQt includes. #include <tqmap.h> #include <tqlistview.h> @@ -55,9 +55,10 @@ class KCMKttsMgr : virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT public: - KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &); + KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &); ~KCMKttsMgr(); @@ -285,7 +286,7 @@ class KCMKttsMgr : * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ TQString FilterNameToDesktopEntryName(const TQString& name); @@ -510,13 +511,13 @@ class KCMKttsMgr : /// This is a small helper class to detect when user checks/unchecks a Filter in Filters tab /// and emit changed() signal. -class KttsCheckListItem : public QCheckListItem +class KttsCheckListItem : public TQCheckListItem { public: - KttsCheckListItem( TQListView *parent, + KttsCheckListItem( TQListView *tqparent, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); - KttsCheckListItem( TQListView *parent, TQListViewItem *after, + KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index 36942a3..ab66ca2 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>mainTab</cstring> </property> @@ -37,7 +37,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>enableKttsdCheckBox</cstring> </property> @@ -59,7 +59,7 @@ <string>Check to start the KTTS Deamon and enable Text-to-Speech.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>embedInSysTrayCheckBox</cstring> </property> @@ -83,16 +83,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -108,14 +108,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showMainWindowOnStartupCheckBox</cstring> </property> @@ -131,9 +131,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <hbox> <property name="name"> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoexitMgrCheckBox</cstring> </property> @@ -172,7 +172,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>autostartMgrCheckBox</cstring> </property> @@ -188,7 +188,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -284,9 +284,9 @@ <string>This is a list of all the configured Talkers. A Talker is a speech synthesizer that has been configured with a language, voice, gender, speaking rate, and volume. Talkers higher in the list have higher priority. The topmost Talker will be used when no talker attributes have been specified by an application.</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -315,7 +315,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>higherTalkerPriorityButton</cstring> </property> @@ -331,7 +331,7 @@ <string>U&p</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>lowerTalkerPriorityButton</cstring> </property> @@ -407,7 +407,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -418,7 +418,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -429,7 +429,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>notifyGroup</cstring> </property> @@ -493,15 +493,15 @@ <string>This is a list of configured application events and actions to be taken when received. The "default" event governs all events not specifically configured.</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>notifyPresentLabel</cstring> </property> @@ -523,7 +523,7 @@ <string>Applies only to the default event. Does not affect application-specific events. Only events that display in the manner which you select will be spoken.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>notifyPresentComboBox</cstring> </property> @@ -533,15 +533,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyAddButton</cstring> </property> @@ -555,7 +555,7 @@ <string>Click to configure notification for a specific application event.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyRemoveButton</cstring> </property> @@ -576,14 +576,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>152</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyClearButton</cstring> </property> @@ -594,7 +594,7 @@ <string>Removes all the application specific events. The default event remains.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyLoadButton</cstring> </property> @@ -605,7 +605,7 @@ <string>Click to read configured notification events from a file.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifySaveButton</cstring> </property> @@ -618,7 +618,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>notifyExceptionActionLayout</cstring> </property> @@ -626,7 +626,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>notifyTestButton</cstring> </property> @@ -640,7 +640,7 @@ <string>Click this button to test the notification. A sample message will be spoken. Note: The Text-to-Speech system must be enabled.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>notifyActionLabel</cstring> </property> @@ -662,7 +662,7 @@ <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>notifyMsgLineEdit</cstring> </property> @@ -670,7 +670,7 @@ <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>notifyActionComboBox</cstring> </property> @@ -688,15 +688,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout19_2</cstring> + <cstring>tqlayout19_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>notifyTalkerLabel</cstring> </property> @@ -751,15 +751,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>notifyEnableCheckBox</cstring> </property> @@ -780,14 +780,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>notifyExcludeEventsWithSoundCheckBox</cstring> </property> @@ -805,7 +805,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -816,9 +816,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -846,9 +846,9 @@ <string>This is a list of all the configured Filters. Filters higher in the list are applied first. Filters modify text before it is spoken. They can be used to substitute for mispronounced words, transform XML from one form to another, or change the default Talker to be used for speech output.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9_2</cstring> + <cstring>tqlayout9_2</cstring> </property> <vbox> <property name="name"> @@ -877,7 +877,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>higherFilterPriorityButton</cstring> </property> @@ -896,7 +896,7 @@ <string>Click to move selected filter up in the list. Filters higher in the list are applied first.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>lowerFilterPriorityButton</cstring> </property> @@ -975,7 +975,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -986,9 +986,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -1016,15 +1016,15 @@ <string>This is a list of all the configured Sentence Boundary Detector (SBD) Filters. SBDs break long text jobs up into sentences, which reduces the time before a job begins speaking, and permits you to advance or rewind through a job. SBDs are applied in the order listed (top to bottom) after all the normal filters at the top of this screen have been applied. Filtering stops when the first SBD modifies the text.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>sbdButton</cstring> </property> @@ -1053,7 +1053,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>11</height> @@ -1066,7 +1066,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1077,9 +1077,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> @@ -1116,7 +1116,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>textPostMsgCheck</cstring> </property> @@ -1130,7 +1130,7 @@ <string>Check the Post-message box and enter a Post-message, which will be spoken when a text job resumes after being interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>textPreSndCheck</cstring> </property> @@ -1152,7 +1152,7 @@ <string>Check the Pre-sound box and choose a Pre-sound audio file, which will sound when a text job is interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>textPreMsgCheck</cstring> </property> @@ -1188,7 +1188,7 @@ <string>Check the Post-sound and choose a Post-sound audio file, which will sound before a text job resumes after being interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>textPostSndCheck</cstring> </property> @@ -1229,7 +1229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>180</height> @@ -1238,7 +1238,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1249,15 +1249,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>keepAudioCheckBox</cstring> </property> @@ -1289,15 +1289,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -1350,7 +1350,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -1391,7 +1391,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -1408,14 +1408,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>audioButtonGroup</cstring> </property> @@ -1437,15 +1437,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>sinkLabel</cstring> </property> @@ -1480,15 +1480,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout8_2_2</cstring> + <cstring>tqlayout8_2_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>akodeSinkLabel</cstring> </property> @@ -1523,7 +1523,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>gstreamerRadioButton</cstring> </property> @@ -1540,7 +1540,7 @@ <string><p>Check to use the GStreamer audio output system. You must also select a <b>Sink</b> plugin.</p></string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>artsRadioButton</cstring> </property> @@ -1557,7 +1557,7 @@ <string>Check to use the KDE aRts system for audio output.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>akodeRadioButton</cstring> </property> @@ -1580,15 +1580,15 @@ <string><p>Check to use aKode for audio output. You must also select a <b>Sink</b>.</p></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>alsaRadioButton</cstring> </property> @@ -1611,15 +1611,15 @@ <string>Check to use Advanced Linux Sound Architecture (ALSA) for audio output.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8_2</cstring> + <cstring>tqlayout8_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pcmLabel</cstring> </property> @@ -1654,7 +1654,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>pcmCustom</cstring> </property> @@ -1888,13 +1888,13 @@ <include location="global" impldecl="in implementation">klocale.h</include> <include location="global" impldecl="in implementation">kdebug.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>configChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="private">slotConfigChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="6"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="6"/> <includehints> <includehint>kcmodule.h</includehint> <includehint>klistview.h</includehint> diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h index 206524a..ff6ebb3 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 8a77c38..55a78d7 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqcombobox.h> // KDE includes @@ -36,8 +36,8 @@ #include "utils.h" #include "selectevent.h" -SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQString& initEventSrc) - : SelectEventWidget(parent,name,fl) +SelectEvent::SelectEvent(TQWidget* tqparent, const char* name, WFlags fl, const TQString& initEventSrc) + : SelectEventWidget(tqparent,name,fl) { // Load list of event sources (applications). TQStringList fullpaths = @@ -61,13 +61,13 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ if ( !relativePath.isEmpty() ) { KConfig* config = new KConfig(relativePath, true, false, "data"); - config->setGroup( TQString::fromLatin1("!Global!") ); - TQString icon = config->readEntry(TQString::fromLatin1("IconName"), - TQString::fromLatin1("misc")); - TQString description = config->readEntry( TQString::fromLatin1("Comment"), + config->setGroup( TQString::tqfromLatin1("!Global!") ); + TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"), + TQString::tqfromLatin1("misc")); + TQString description = config->readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); delete config; - int index = relativePath.find( '/' ); + int index = relativePath.tqfind( '/' ); TQString appname; if ( index >= 0 ) appname = relativePath.left( index ); @@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) eventsListView->clear(); TQListViewItem* item = 0; TQString eventSrc = m_eventSrcNames[index]; - TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); + TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" ); KConfig* config = new KConfig( configFilename, true, false, "data" ); TQStringList eventNames = config->groupList(); uint eventNamesCount = eventNames.count(); @@ -99,8 +99,8 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) if ( eventName != "!Global!" ) { config->setGroup( eventName ); - TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ), - config->readEntry( TQString::fromLatin1( "Name" ))); + TQString eventDesc = config->readEntry( TQString::tqfromLatin1( "Comment" ), + config->readEntry( TQString::tqfromLatin1( "Name" ))); if ( !item ) item = new KListViewItem( eventsListView, eventDesc, eventName ); else @@ -110,7 +110,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) delete config; eventsListView->sort(); item = eventsListView->lastChild(); - TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText()); + TQString eventDesc = i18n("All other %1 events").tqarg(eventSrcComboBox->currentText()); if ( !item ) item = new KListViewItem( eventsListView, eventDesc, "default" ); else @@ -129,18 +129,18 @@ TQString SelectEvent::getEvent() if ( item ) return item->text(1); else - return TQString::null; + return TQString(); } // returns e.g. "kwin/eventsrc" from a given path // "/opt/kde3/share/apps/kwin/eventsrc" TQString SelectEvent::makeRelative( const TQString& fullPath ) { - int slash = fullPath.findRev( '/' ) - 1; - slash = fullPath.findRev( '/', slash ); + int slash = fullPath.tqfindRev( '/' ) - 1; + slash = fullPath.tqfindRev( '/', slash ); if ( slash < 0 ) - return TQString::null; + return TQString(); return fullPath.mid( slash+1 ); } diff --git a/kttsd/kcmkttsmgr/selectevent.h b/kttsd/kcmkttsmgr/selectevent.h index 95d60f9..f7ce996 100644 --- a/kttsd/kcmkttsmgr/selectevent.h +++ b/kttsd/kcmkttsmgr/selectevent.h @@ -29,16 +29,17 @@ class SelectEvent : public SelectEventWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent Inherited KDialog parameter. + * @param tqparent Inherited KDialog parameter. * @param name Inherited KDialog parameter. * @param initEventSrc Event source to start with. */ - SelectEvent(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0, - const TQString& initEventSrc = TQString::null ); + SelectEvent(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0, + const TQString& initEventSrc = TQString() ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui index 13b91f1..ece6a71 100644 --- a/kttsd/kcmkttsmgr/selecteventwidget.ui +++ b/kttsd/kcmkttsmgr/selecteventwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SelectEventWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SelectEventWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>eventSrcLabel</cstring> </property> @@ -27,7 +27,7 @@ <cstring>eventSrcComboBox</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>eventSrcComboBox</cstring> </property> @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> |