From 23aecb275d6085b7a15a38da0180edf156c8ea9d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:44:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kttsd/kcmkttsmgr/addtalkerwidget.ui | 16 +++++----- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 16 +++++----- kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 58 ++++++++++++++++++------------------ kttsd/kcmkttsmgr/selectevent.cpp | 16 +++++----- 4 files changed, 53 insertions(+), 53 deletions(-) (limited to 'kttsd/kcmkttsmgr') diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui index 4769c21..ae48c61 100644 --- a/kttsd/kcmkttsmgr/addtalkerwidget.ui +++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui @@ -80,7 +80,7 @@ Expanding - + 351 21 @@ -94,7 +94,7 @@ &Synthesizer: - + AlignVCenter|AlignRight @@ -115,7 +115,7 @@ Fixed - + 25 20 @@ -132,7 +132,7 @@ Fixed - + 30 20 @@ -149,7 +149,7 @@ Fixed - + 30 20 @@ -166,7 +166,7 @@ Fixed - + 25 20 @@ -185,7 +185,7 @@ Show All - + AlignVCenter|AlignLeft @@ -199,7 +199,7 @@ &Language: - + AlignVCenter|AlignRight diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index c81feea..79a18c0 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) m_suppressConfigChanged = false; // Add the KTTS Manager widget - TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0); + TQGridLayout *layout = new TQGridLayout(this, 0, 0); m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw"); // m_kttsmgrw = new KCMKttsMgrWidget(this); - tqlayout->addWidget(m_kttsmgrw, 0, 0); + layout->addWidget(m_kttsmgrw, 0, 0); // Give buttons icons. // Talkers tab. @@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin", - TQString("DesktopEntryName == '%1'").tqarg(name)); + TQString("DesktopEntryName == '%1'").arg(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'").tqarg(plugInName)); + TQString("DesktopEntryName == '%1'").arg(plugInName)); if (offers.count() == 1) { @@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter() true, true); m_configDlg->setInitialSize(TQSize(600, 450), false); - m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint()); + m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint()); m_loadedFilterPlugIn->show(); m_configDlg->setMainWidget(m_loadedFilterPlugIn); m_configDlg->setHelp("configure-filter", "kttsd"); @@ -2221,7 +2221,7 @@ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryNa { if (desktopEntryName.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); + TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); if (offers.count() == 1) return offers[0]->name(); @@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( else { if (event == "default") - eventName = i18n("All other %1 events").tqarg(eventSrcName); + eventName = i18n("All other %1 events").arg(eventSrcName); else eventName = NotifyEvent::getEventName(eventSrc, event); } diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index b5c7a6b..766a1a2 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -92,7 +92,7 @@ - tqlayout5 + layout5 @@ -108,7 +108,7 @@ Fixed - + 20 20 @@ -133,7 +133,7 @@ - tqlayout5_2 + layout5_2 @@ -149,7 +149,7 @@ Fixed - + 20 20 @@ -286,7 +286,7 @@ - tqlayout9 + layout9 @@ -407,7 +407,7 @@ Expanding - + 20 20 @@ -495,7 +495,7 @@ - tqlayout21 + layout21 @@ -535,7 +535,7 @@ - tqlayout28 + layout28 @@ -576,7 +576,7 @@ Expanding - + 152 20 @@ -690,7 +690,7 @@ - tqlayout19_2 + layout19_2 @@ -753,7 +753,7 @@ - tqlayout17 + layout17 @@ -780,7 +780,7 @@ Expanding - + 16 20 @@ -818,7 +818,7 @@ - tqlayout14 + layout14 @@ -848,7 +848,7 @@ - tqlayout9_2 + layout9_2 @@ -975,7 +975,7 @@ Expanding - + 20 20 @@ -988,7 +988,7 @@ - tqlayout18 + layout18 @@ -1018,7 +1018,7 @@ - tqlayout16 + layout16 @@ -1053,7 +1053,7 @@ Expanding - + 20 11 @@ -1079,7 +1079,7 @@ - tqlayout15 + layout15 @@ -1229,7 +1229,7 @@ Expanding - + 21 180 @@ -1251,7 +1251,7 @@ - tqlayout12 + layout12 @@ -1291,7 +1291,7 @@ - tqlayout13 + layout13 @@ -1391,7 +1391,7 @@ Expanding - + 20 40 @@ -1408,7 +1408,7 @@ Expanding - + 90 20 @@ -1439,7 +1439,7 @@ - tqlayout8 + layout8 @@ -1482,7 +1482,7 @@ - tqlayout8_2_2 + layout8_2_2 @@ -1582,7 +1582,7 @@ - tqlayout21 + layout21 @@ -1613,7 +1613,7 @@ - tqlayout8_2 + layout8_2 diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 44226b7..0d9fe60 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -61,10 +61,10 @@ 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::tqfromLatin1("!Global!") ); - TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"), - TQString::tqfromLatin1("misc")); - TQString description = config->readEntry( TQString::tqfromLatin1("Comment"), + config->setGroup( TQString::fromLatin1("!Global!") ); + TQString icon = config->readEntry(TQString::fromLatin1("IconName"), + TQString::fromLatin1("misc")); + TQString description = config->readEntry( TQString::fromLatin1("Comment"), i18n("No description available") ); delete config; int index = relativePath.find( '/' ); @@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) eventsListView->clear(); TQListViewItem* item = 0; TQString eventSrc = m_eventSrcNames[index]; - TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" ); + TQString configFilename = eventSrc + TQString::fromLatin1( "/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::tqfromLatin1( "Comment" ), - config->readEntry( TQString::tqfromLatin1( "Name" ))); + TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ), + config->readEntry( TQString::fromLatin1( "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").tqarg(eventSrcComboBox->currentText()); + TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText()); if ( !item ) item = new KListViewItem( eventsListView, eventDesc, "default" ); else -- cgit v1.2.1