diff options
Diffstat (limited to 'kcontrol/locale')
-rw-r--r-- | kcontrol/locale/kcmlocale.cpp | 238 | ||||
-rw-r--r-- | kcontrol/locale/kcmlocale.h | 34 | ||||
-rw-r--r-- | kcontrol/locale/klocalesample.cpp | 74 | ||||
-rw-r--r-- | kcontrol/locale/klocalesample.h | 14 | ||||
-rw-r--r-- | kcontrol/locale/localemon.cpp | 164 | ||||
-rw-r--r-- | kcontrol/locale/localemon.h | 36 | ||||
-rw-r--r-- | kcontrol/locale/localenum.cpp | 92 | ||||
-rw-r--r-- | kcontrol/locale/localenum.h | 28 | ||||
-rw-r--r-- | kcontrol/locale/localeother.cpp | 48 | ||||
-rw-r--r-- | kcontrol/locale/localeother.h | 12 | ||||
-rw-r--r-- | kcontrol/locale/localetime.cpp | 174 | ||||
-rw-r--r-- | kcontrol/locale/localetime.h | 50 | ||||
-rw-r--r-- | kcontrol/locale/main.cpp | 2 | ||||
-rw-r--r-- | kcontrol/locale/toplevel.cpp | 164 | ||||
-rw-r--r-- | kcontrol/locale/toplevel.h | 10 |
15 files changed, 570 insertions, 570 deletions
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 0a24b4a59..39210741f 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -23,13 +23,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <kdebug.h> #include <kdialog.h> @@ -43,50 +43,50 @@ #include "toplevel.h" KLocaleConfig::KLocaleConfig(KLocale *locale, - QWidget *parent, const char *name) - : QWidget (parent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 4, 3, + TQGridLayout *lay = new TQGridLayout(this, 4, 3, KDialog::marginHint(), KDialog::spacingHint()); - m_labCountry = new QLabel(this, I18N_NOOP("Country or region:")); + m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:")); m_comboCountry = new KLanguageButton( this ); m_labCountry->setBuddy(m_comboCountry); - connect( m_comboCountry, SIGNAL(activated(const QString &)), - this, SLOT(changedCountry(const QString &)) ); + connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)), + this, TQT_SLOT(changedCountry(const TQString &)) ); - m_labLang = new QLabel(this, I18N_NOOP("Languages:")); + m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang->setAlignment( AlignTop ); - m_languages = new QListBox(this); - connect(m_languages, SIGNAL(selectionChanged()), - SLOT(slotCheckButtons())); + m_languages = new TQListBox(this); + connect(m_languages, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(slotCheckButtons())); - QWidget * vb = new QWidget(this); - QVBoxLayout * boxlay = new QVBoxLayout(vb, 0, KDialog::spacingHint()); - m_addLanguage = new KLanguageButton(QString::null, vb, I18N_NOOP("Add Language")); + TQWidget * vb = new TQWidget(this); + TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint()); + m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language")); boxlay->add(m_addLanguage); - connect(m_addLanguage, SIGNAL(activated(const QString &)), - SLOT(slotAddLanguage(const QString &))); - m_removeLanguage = new QPushButton(vb, I18N_NOOP("Remove Language")); - m_upButton = new QPushButton(vb, I18N_NOOP("Move Up")); - m_downButton = new QPushButton(vb, I18N_NOOP("Move Down")); + connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(slotAddLanguage(const TQString &))); + m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language")); + m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up")); + m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down")); boxlay->add(m_removeLanguage); boxlay->add(m_upButton); boxlay->add(m_downButton); - connect(m_removeLanguage, SIGNAL(clicked()), - SLOT(slotRemoveLanguage())); - connect(m_upButton, SIGNAL(clicked()), - SLOT(slotLanguageUp())); - connect(m_downButton, SIGNAL(clicked()), - SLOT(slotLanguageDown())); + connect(m_removeLanguage, TQT_SIGNAL(clicked()), + TQT_SLOT(slotRemoveLanguage())); + connect(m_upButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotLanguageUp())); + connect(m_downButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotLanguageDown())); boxlay->insertStretch(-1); // #### HPB: This should be implemented for KDE 3 - // new QLabel(this, I18N_NOOP("Encoding:")); - //QComboBox * cb = new QComboBox( this ); + // new TQLabel(this, I18N_NOOP("Encoding:")); + //TQComboBox * cb = new TQComboBox( this ); //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1); @@ -101,19 +101,19 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, lay->setColStretch(2, 1); // Added jriddell 2007-01-08, for Kubuntu Language Selector spec - QHBoxLayout* languageSelectorLayout = new QHBoxLayout(); - installLanguage = new QPushButton(i18n("Install New Language"), this); + TQHBoxLayout* languageSelectorLayout = new TQHBoxLayout(); + installLanguage = new TQPushButton(i18n("Install New Language"), this); languageSelectorLayout->addWidget(installLanguage); - uninstallLanguage = new QPushButton(i18n("Uninstall Language"), this); + uninstallLanguage = new TQPushButton(i18n("Uninstall Language"), this); languageSelectorLayout->addWidget(uninstallLanguage); - selectLanguage = new QPushButton(i18n("Select System Language"), this); + selectLanguage = new TQPushButton(i18n("Select System Language"), this); languageSelectorLayout->addWidget(selectLanguage); languageSelectorLayout->addStretch(); lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); - connect( installLanguage, SIGNAL(clicked()), this, SLOT(slotInstallLanguage()) ); - connect( uninstallLanguage, SIGNAL(clicked()), this, SLOT(slotUninstallLanguage()) ); - connect( selectLanguage, SIGNAL(clicked()), this, SLOT(slotSelectLanguage()) ); + connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) ); + connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) ); } @@ -123,8 +123,8 @@ void KLocaleConfig::slotInstallLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode install"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -135,8 +135,8 @@ void KLocaleConfig::slotUninstallLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode uninstall"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -147,8 +147,8 @@ void KLocaleConfig::slotSelectLanguage() *proc << "kdesu"; *proc << "qt-language-selector --mode select"; - QApplication::connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLanguageSelectorExited(KProcess *))); + TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); setEnabled(false); proc->start(); } @@ -160,9 +160,9 @@ void KLocaleConfig::slotLanguageSelectorExited(KProcess *) setEnabled(true); } -void KLocaleConfig::slotAddLanguage(const QString & code) +void KLocaleConfig::slotAddLanguage(const TQString & code) { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); if ( pos < 0 ) @@ -176,7 +176,7 @@ void KLocaleConfig::slotAddLanguage(const QString & code) if ( oldPos != -1 && oldPos < pos ) --pos; - QStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.at( pos ); languageList.insert( it, code ); @@ -189,10 +189,10 @@ void KLocaleConfig::slotAddLanguage(const QString & code) void KLocaleConfig::slotRemoveLanguage() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.at( pos ); if ( it != languageList.end() ) { @@ -208,15 +208,15 @@ void KLocaleConfig::slotRemoveLanguage() void KLocaleConfig::slotLanguageUp() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it1 = languageList.at( pos - 1 ); - QStringList::Iterator it2 = languageList.at( pos ); + TQStringList::Iterator it1 = languageList.at( pos - 1 ); + TQStringList::Iterator it2 = languageList.at( pos ); if ( it1 != languageList.end() && it2 != languageList.end() ) { - QString str = *it1; + TQString str = *it1; *it1 = *it2; *it2 = str; @@ -230,15 +230,15 @@ void KLocaleConfig::slotLanguageUp() void KLocaleConfig::slotLanguageDown() { - QStringList languageList = m_locale->languageList(); + TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - QStringList::Iterator it1 = languageList.at( pos ); - QStringList::Iterator it2 = languageList.at( pos + 1 ); + TQStringList::Iterator it1 = languageList.at( pos ); + TQStringList::Iterator it2 = languageList.at( pos + 1 ); if ( it1 != languageList.end() && it2 != languageList.end() ) { - QString str = *it1; + TQString str = *it1; *it1 = *it2; *it2 = str; @@ -259,49 +259,49 @@ void KLocaleConfig::loadLanguageList() // clear the list m_addLanguage->clear(); - QStringList first = languageList(); + TQStringList first = languageList(); - QStringList prilang; + TQStringList prilang; // add the primary languages for the country to the list - for ( QStringList::ConstIterator it = first.begin(); + for ( TQStringList::ConstIterator it = first.begin(); it != first.end(); ++it ) { - QString str = locate("locale", QString::fromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; } // add all languages to the list - QStringList alllang = KGlobal::dirs()->findAllResources("locale", - QString::fromLatin1("*/entry.desktop"), + TQStringList alllang = KGlobal::dirs()->findAllResources("locale", + TQString::fromLatin1("*/entry.desktop"), false, true); - QStringList langlist = prilang; + TQStringList langlist = prilang; if (langlist.count() > 0) - langlist << QString::null; // separator + langlist << TQString::null; // separator langlist += alllang; int menu_index = -2; - QString submenu; // we are working on this menu - for ( QStringList::ConstIterator it = langlist.begin(); + TQString submenu; // we are working on this menu + for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = QString::fromLatin1("other"); + submenu = TQString::fromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), - submenu, QString::null, -1); + submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted continue; } KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag = tag.left(index); index = tag.findRev('/'); @@ -319,20 +319,20 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - QString sub = QString::fromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); - QStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + QString::fromLatin1("*.desktop"), + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", + sub + TQString::fromLatin1("*.desktop"), false, true ); - for ( QStringList::ConstIterator it = regionlist.begin(); + for ( TQStringList::ConstIterator it = regionlist.begin(); it != regionlist.end(); ++it ) { - QString tag = *it; + TQString tag = *it; int index; index = tag.findRev('/'); @@ -345,42 +345,42 @@ void KLocaleConfig::loadCountryList() KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString map( locate( "locale", - QString::fromLatin1( "l10n/%1.png" ) + TQString map( locate( "locale", + TQString::fromLatin1( "l10n/%1.png" ) .arg(tag) ) ); - QIconSet icon; + TQIconSet icon; if ( !map.isNull() ) icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small); m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 ); } // add all languages to the list - QStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + QString::fromLatin1("*/entry.desktop"), false, true); + TQStringList countrylist = KGlobal::dirs()->findAllResources + ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); - for ( QStringList::ConstIterator it = countrylist.begin(); + for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", + TQString name = entry.readEntry("Name", m_locale->translate("without name")); - QString submenu = entry.readEntry("Region"); + TQString submenu = entry.readEntry("Region"); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag.truncate(index); index = tag.findRev('/'); tag = tag.mid(index + 1); int menu_index = submenu.isEmpty() ? -1 : -2; - QString flag( locate( "locale", - QString::fromLatin1( "l10n/%1/flag.png" ) + TQString flag( locate( "locale", + TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); - QIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); + TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); } @@ -388,15 +388,15 @@ void KLocaleConfig::loadCountryList() KGlobal::_locale = lsave; } -void KLocaleConfig::readLocale(const QString &path, QString &name, - const QString &sub) const +void KLocaleConfig::readLocale(const TQString &path, TQString &name, + const TQString &sub) const { // temperary use of our locale as the global locale KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; // read the name - QString filepath = QString::fromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -416,7 +416,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", QString::fromLatin1(""), true, true); + config->writeEntry("Language", TQString::fromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -439,13 +439,13 @@ void KLocaleConfig::slotLocaleChanged() // update language widget m_languages->clear(); - QStringList languageList = m_locale->languageList(); - for ( QStringList::Iterator it = languageList.begin(); + TQStringList languageList = m_locale->languageList(); + for ( TQStringList::Iterator it = languageList.begin(); it != languageList.end(); ++it ) { - QString name; - readLocale(*it, name, QString::null); + TQString name; + readLocale(*it, name, TQString::null); m_languages->insertItem(name); } @@ -458,29 +458,29 @@ void KLocaleConfig::slotTranslate() { kdDebug() << "slotTranslate()" << endl; - QToolTip::add(m_comboCountry, m_locale->translate + TQToolTip::add(m_comboCountry, m_locale->translate ( "This is where you live. KDE will use the defaults for " "this country or region.") ); - QToolTip::add(m_addLanguage, m_locale->translate + TQToolTip::add(m_addLanguage, m_locale->translate ( "This will add a language to the list. If the language is already " "in the list, the old one will be moved instead." ) ); - QToolTip::add(m_removeLanguage, m_locale->translate + TQToolTip::add(m_removeLanguage, m_locale->translate ( "This will remove the highlighted language from the list." ) ); - QToolTip::add(m_languages, m_locale->translate + TQToolTip::add(m_languages, m_locale->translate ( "KDE programs will be displayed in the first available language in " "this list.\nIf none of the languages are available, US English " "will be used.") ); - QString str; + TQString str; str = m_locale->translate ( "Here you can choose your country or region. The settings " "for languages, numbers etc. will automatically switch to the " "corresponding values." ); - QWhatsThis::add( m_labCountry, str ); - QWhatsThis::add( m_comboCountry, str ); + TQWhatsThis::add( m_labCountry, str ); + TQWhatsThis::add( m_comboCountry, str ); str = m_locale->translate ( "Here you can choose the languages that will be used by KDE. If the " @@ -490,16 +490,16 @@ void KLocaleConfig::slotTranslate() "languages from the place you got KDE from.<p>" "Note that some applications may not be translated to your languages; " "in this case, they will automatically fall back to US English." ); - QWhatsThis::add( m_labLang, str ); - QWhatsThis::add( m_languages, str ); - QWhatsThis::add( m_addLanguage, str ); - QWhatsThis::add( m_removeLanguage, str ); + TQWhatsThis::add( m_labLang, str ); + TQWhatsThis::add( m_languages, str ); + TQWhatsThis::add( m_addLanguage, str ); + TQWhatsThis::add( m_removeLanguage, str ); } -QStringList KLocaleConfig::languageList() const +TQStringList KLocaleConfig::languageList() const { - QString fileName = locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString fileName = locate("locale", + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); @@ -508,19 +508,19 @@ QStringList KLocaleConfig::languageList() const return entry.readListEntry("Languages"); } -void KLocaleConfig::changedCountry(const QString & code) +void KLocaleConfig::changedCountry(const TQString & code) { m_locale->setCountry(code); // change to the preferred languages in that country, installed only - QStringList languages = languageList(); - QStringList newLanguageList; - for ( QStringList::Iterator it = languages.begin(); + TQStringList languages = languageList(); + TQStringList newLanguageList; + for ( TQStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { - QString name; - readLocale(*it, name, QString::null); + TQString name; + readLocale(*it, name, TQString::null); if (!name.isEmpty()) newLanguageList += *it; diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h index 46f954730..b5b191ccf 100644 --- a/kcontrol/locale/kcmlocale.h +++ b/kcontrol/locale/kcmlocale.h @@ -25,8 +25,8 @@ #ifndef KCMLOCALE_H #define KCMLOCALE_H -#include <qwidget.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqstringlist.h> class KAddButton; class KLanguageButton; @@ -43,7 +43,7 @@ class KLocaleConfig : public QWidget public: KLocaleConfig( KLocale *_locale, - QWidget *parent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); void save(); @@ -65,11 +65,11 @@ private slots: void loadLanguageList(); void loadCountryList(); - void changedCountry(const QString & code); - void readLocale(const QString &path, QString &name, - const QString &sub) const; + void changedCountry(const TQString & code); + void readLocale(const TQString &path, TQString &name, + const TQString &sub) const; - void slotAddLanguage(const QString & id); + void slotAddLanguage(const TQString & id); void slotRemoveLanguage(); void slotLanguageUp(); void slotLanguageDown(); @@ -81,24 +81,24 @@ private slots: void slotLanguageSelectorExited(KProcess *); private: - QStringList languageList() const; + TQStringList languageList() const; KLocale *m_locale; KLanguageButton *m_comboCountry; - QLabel *m_labCountry; - QLabel *m_labLang; + TQLabel *m_labCountry; + TQLabel *m_labLang; - QListBox * m_languages; + TQListBox * m_languages; KLanguageButton * m_addLanguage; - QPushButton * m_removeLanguage; - QPushButton * m_upButton; - QPushButton * m_downButton; + TQPushButton * m_removeLanguage; + TQPushButton * m_upButton; + TQPushButton * m_downButton; - QPushButton* installLanguage; - QPushButton* uninstallLanguage; - QPushButton* selectLanguage; + TQPushButton* installLanguage; + TQPushButton* uninstallLanguage; + TQPushButton* selectLanguage; }; #endif diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index e78ae966c..bf4cc8b32 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -23,11 +23,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qdatetime.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qtimer.h> +#include <tqdatetime.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqtimer.h> #include <stdio.h> @@ -37,48 +37,48 @@ #include "klocalesample.moc" KLocaleSample::KLocaleSample(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 5, 2); + TQGridLayout *lay = new TQGridLayout(this, 5, 2); lay->setAutoAdd(TRUE); // Whatever the color scheme is, we want black text - QColorGroup a = palette().active(); - a.setColor(QColorGroup::Foreground, Qt::black); - QPalette pal(a, a, a); + TQColorGroup a = palette().active(); + a.setColor(TQColorGroup::Foreground, Qt::black); + TQPalette pal(a, a, a); - m_labNumber = new QLabel(this, I18N_NOOP("Numbers:")); + m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:")); m_labNumber->setPalette(pal); - m_numberSample = new QLabel(this); + m_numberSample = new TQLabel(this); m_numberSample->setPalette(pal); - m_labMoney = new QLabel(this, I18N_NOOP("Money:")); + m_labMoney = new TQLabel(this, I18N_NOOP("Money:")); m_labMoney->setPalette(pal); - m_moneySample = new QLabel(this); + m_moneySample = new TQLabel(this); m_moneySample->setPalette(pal); - m_labDate = new QLabel(this, I18N_NOOP("Date:")); + m_labDate = new TQLabel(this, I18N_NOOP("Date:")); m_labDate->setPalette(pal); - m_dateSample = new QLabel(this); + m_dateSample = new TQLabel(this); m_dateSample->setPalette(pal); - m_labDateShort = new QLabel(this, I18N_NOOP("Short date:")); + m_labDateShort = new TQLabel(this, I18N_NOOP("Short date:")); m_labDateShort->setPalette(pal); - m_dateShortSample = new QLabel(this); + m_dateShortSample = new TQLabel(this); m_dateShortSample->setPalette(pal); - m_labTime = new QLabel(this, I18N_NOOP("Time:")); + m_labTime = new TQLabel(this, I18N_NOOP("Time:")); m_labTime->setPalette(pal); - m_timeSample = new QLabel(this); + m_timeSample = new TQLabel(this); m_timeSample->setPalette(pal); lay->setColStretch(0, 1); lay->setColStretch(1, 3); - QTimer *timer = new QTimer(this, "clock_timer"); - connect(timer, SIGNAL(timeout()), this, SLOT(slotUpdateTime())); + TQTimer *timer = new TQTimer(this, "clock_timer"); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime())); timer->start(1000); } @@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - QDateTime dt = QDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); m_dateSample->setText(m_locale->formatDate(dt.date(), false)); m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); @@ -98,35 +98,35 @@ void KLocaleSample::slotUpdateTime() void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - QString::fromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - QString::fromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); - QString str; + TQString str; str = m_locale->translate("This is how numbers will be displayed."); - QWhatsThis::add( m_labNumber, str ); - QWhatsThis::add( m_numberSample, str ); + TQWhatsThis::add( m_labNumber, str ); + TQWhatsThis::add( m_numberSample, str ); str = m_locale->translate("This is how monetary values will be displayed."); - QWhatsThis::add( m_labMoney, str ); - QWhatsThis::add( m_moneySample, str ); + TQWhatsThis::add( m_labMoney, str ); + TQWhatsThis::add( m_moneySample, str ); str = m_locale->translate("This is how date values will be displayed."); - QWhatsThis::add( m_labDate, str ); - QWhatsThis::add( m_dateSample, str ); + TQWhatsThis::add( m_labDate, str ); + TQWhatsThis::add( m_dateSample, str ); str = m_locale->translate("This is how date values will be displayed using " "a short notation."); - QWhatsThis::add( m_labDateShort, str ); - QWhatsThis::add( m_dateShortSample, str ); + TQWhatsThis::add( m_labDateShort, str ); + TQWhatsThis::add( m_dateShortSample, str ); str = m_locale->translate("This is how the time will be displayed."); - QWhatsThis::add( m_labTime, str ); - QWhatsThis::add( m_timeSample, str ); + TQWhatsThis::add( m_labTime, str ); + TQWhatsThis::add( m_timeSample, str ); } diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h index bf1cd7462..dbdce0b5c 100644 --- a/kcontrol/locale/klocalesample.h +++ b/kcontrol/locale/klocalesample.h @@ -25,7 +25,7 @@ #ifndef __KLOCALESAMPLE_H__ #define __KLOCALESAMPLE_H__ -#include <qwidget.h> +#include <tqwidget.h> class QLabel; class QResizeEvent; @@ -37,7 +37,7 @@ class KLocaleSample : public QWidget Q_OBJECT public: KLocaleSample(KLocale *_locale, - QWidget *parent = 0, const char*name = 0); + TQWidget *parent = 0, const char*name = 0); virtual ~KLocaleSample(); public slots: @@ -48,11 +48,11 @@ protected slots: private: KLocale *m_locale; - QLabel *m_numberSample, *m_labNumber; - QLabel *m_moneySample, *m_labMoney; - QLabel *m_timeSample, *m_labTime; - QLabel *m_dateSample, *m_labDate; - QLabel *m_dateShortSample, *m_labDateShort; + TQLabel *m_numberSample, *m_labNumber; + TQLabel *m_moneySample, *m_labMoney; + TQLabel *m_timeSample, *m_labTime; + TQLabel *m_dateSample, *m_labDate; + TQLabel *m_dateShortSample, *m_labDateShort; }; #endif diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 504ce393c..9fa1ad708 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -21,16 +21,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qobjectlist.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qvbox.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqobjectlist.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqvbox.h> +#include <tqregexp.h> #include <knuminput.h> #include <kdialog.h> @@ -42,77 +42,77 @@ #include "localemon.moc" KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { // Money - QGridLayout *lay = new QGridLayout(this, 6, 2, + TQGridLayout *lay = new TQGridLayout(this, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); - m_labMonCurSym = new QLabel(this, I18N_NOOP("Currency symbol:")); + m_labMonCurSym = new TQLabel(this, I18N_NOOP("Currency symbol:")); lay->addWidget(m_labMonCurSym, 0, 0); - m_edMonCurSym = new QLineEdit(this); + m_edMonCurSym = new TQLineEdit(this); lay->addWidget(m_edMonCurSym, 0, 1); - connect( m_edMonCurSym, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonCurSymChanged(const QString &) ) ); + connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonCurSymChanged(const TQString &) ) ); - m_labMonDecSym = new QLabel(this, I18N_NOOP("Decimal symbol:")); + m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:")); lay->addWidget(m_labMonDecSym, 1, 0); - m_edMonDecSym = new QLineEdit(this); + m_edMonDecSym = new TQLineEdit(this); lay->addWidget(m_edMonDecSym, 1, 1); - connect( m_edMonDecSym, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonDecSymChanged(const QString &) ) ); + connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonDecSymChanged(const TQString &) ) ); - m_labMonThoSep = new QLabel(this, I18N_NOOP("Thousands separator:")); + m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:")); lay->addWidget(m_labMonThoSep, 2, 0); - m_edMonThoSep = new QLineEdit(this); + m_edMonThoSep = new TQLineEdit(this); lay->addWidget(m_edMonThoSep, 2, 1); - connect( m_edMonThoSep, SIGNAL( textChanged(const QString &) ), - SLOT( slotMonThoSepChanged(const QString &) ) ); + connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ), + TQT_SLOT( slotMonThoSepChanged(const TQString &) ) ); - m_labMonFraDig = new QLabel(this, I18N_NOOP("Fract digits:")); + m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:")); lay->addWidget(m_labMonFraDig, 3, 0); m_inMonFraDig = new KIntNumInput(this); m_inMonFraDig->setRange(0, 10, 1, false); lay->addWidget(m_inMonFraDig, 3, 1); - connect( m_inMonFraDig, SIGNAL( valueChanged(int) ), - SLOT( slotMonFraDigChanged(int) ) ); + connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ), + TQT_SLOT( slotMonFraDigChanged(int) ) ); - QWidget *vbox = new QVBox(this); + TQWidget *vbox = new TQVBox(this); lay->addMultiCellWidget(vbox, 4, 4, 0, 1); - QVGroupBox *vgrp; - vgrp = new QVGroupBox( vbox, I18N_NOOP("Positive") ); - m_chMonPosPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonPosPreCurSym, SIGNAL( clicked() ), - SLOT( slotMonPosPreCurSymChanged() ) ); - - QHBox *hbox; - hbox = new QHBox( vgrp ); - m_labMonPosMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:")); - m_cmbMonPosMonSignPos = new QComboBox(hbox, "signpos"); - connect( m_cmbMonPosMonSignPos, SIGNAL( activated(int) ), - SLOT( slotMonPosMonSignPosChanged(int) ) ); - - vgrp = new QVGroupBox( vbox, I18N_NOOP("Negative") ); - m_chMonNegPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonNegPreCurSym, SIGNAL( clicked() ), - SLOT( slotMonNegPreCurSymChanged() ) ); - - hbox = new QHBox( vgrp ); - m_labMonNegMonSignPos = new QLabel(hbox, I18N_NOOP("Sign position:")); - m_cmbMonNegMonSignPos = new QComboBox(hbox, "signpos"); - connect( m_cmbMonNegMonSignPos, SIGNAL( activated(int) ), - SLOT( slotMonNegMonSignPosChanged(int) ) ); + TQVGroupBox *vgrp; + vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") ); + m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); + connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotMonPosPreCurSymChanged() ) ); + + TQHBox *hbox; + hbox = new TQHBox( vgrp ); + m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); + m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos"); + connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMonPosMonSignPosChanged(int) ) ); + + vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") ); + m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); + connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotMonNegPreCurSymChanged() ) ); + + hbox = new TQHBox( vgrp ); + m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); + m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos"); + connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMonNegMonSignPosChanged(int) ) ); // insert some items int i = 5; while (i--) { - m_cmbMonPosMonSignPos->insertItem(QString::null); - m_cmbMonNegMonSignPos->insertItem(QString::null); + m_cmbMonPosMonSignPos->insertItem(TQString::null); + m_cmbMonNegMonSignPos->insertItem(TQString::null); } lay->setColStretch(1, 1); @@ -131,32 +131,32 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; int i; bool b; - str = ent.readEntry("CurrencySymbol", QString::fromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", QString::fromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", QString::fromLatin1(",")); - str.replace(QString::fromLatin1("$0"), QString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); + str.replace(TQString::fromLatin1("$0"), TQString::null); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - QString::fromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->monetaryThousandsSeparator()), true, true); @@ -209,19 +209,19 @@ void KLocaleConfigMoney::slotLocaleChanged() m_cmbMonNegMonSignPos->setCurrentItem( m_locale->negativeMonetarySignPosition() ); } -void KLocaleConfigMoney::slotMonCurSymChanged(const QString &t) +void KLocaleConfigMoney::slotMonCurSymChanged(const TQString &t) { m_locale->setCurrencySymbol(t); emit localeChanged(); } -void KLocaleConfigMoney::slotMonDecSymChanged(const QString &t) +void KLocaleConfigMoney::slotMonDecSymChanged(const TQString &t) { m_locale->setMonetaryDecimalSymbol(t); emit localeChanged(); } -void KLocaleConfigMoney::slotMonThoSepChanged(const QString &t) +void KLocaleConfigMoney::slotMonThoSepChanged(const TQString &t) { m_locale->setMonetaryThousandsSeparator(t); emit localeChanged(); @@ -259,12 +259,12 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void KLocaleConfigMoney::slotTranslate() { - QObjectList list; + TQObjectList list; list.append(m_cmbMonPosMonSignPos); list.append(m_cmbMonNegMonSignPos); - QComboBox *wc; - for (QObjectListIt li(list) ; (wc = (QComboBox *)li.current()) != 0; ++li) + TQComboBox *wc; + for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) { wc->changeItem(m_locale->translate("Parentheses Around"), 0); wc->changeItem(m_locale->translate("Before Quantity Money"), 1); @@ -273,58 +273,58 @@ void KLocaleConfigMoney::slotTranslate() wc->changeItem(m_locale->translate("After Money"), 4); } - QString str; + TQString str; str = m_locale->translate( "Here you can enter your usual currency " "symbol, e.g. $ or DM." "<p>Please note that the Euro symbol may not be " "available on your system, depending on the " "distribution you use." ); - QWhatsThis::add( m_labMonCurSym, str ); - QWhatsThis::add( m_edMonCurSym, str ); + TQWhatsThis::add( m_labMonCurSym, str ); + TQWhatsThis::add( m_edMonCurSym, str ); str = m_locale->translate( "Here you can define the decimal separator used " "to display monetary values." "<p>Note that the decimal separator used to " "display other numbers has to be defined " "separately (see the 'Numbers' tab)." ); - QWhatsThis::add( m_labMonDecSym, str ); - QWhatsThis::add( m_edMonDecSym, str ); + TQWhatsThis::add( m_labMonDecSym, str ); + TQWhatsThis::add( m_edMonDecSym, str ); str = m_locale->translate( "Here you can define the thousands separator " "used to display monetary values." "<p>Note that the thousands separator used to " "display other numbers has to be defined " "separately (see the 'Numbers' tab)." ); - QWhatsThis::add( m_labMonThoSep, str ); - QWhatsThis::add( m_edMonThoSep, str ); + TQWhatsThis::add( m_labMonThoSep, str ); + TQWhatsThis::add( m_edMonThoSep, str ); str = m_locale->translate( "This determines the number of fract digits for " "monetary values, i.e. the number of digits you " "find <em>behind</em> the decimal separator. " "Correct value is 2 for almost all people." ); - QWhatsThis::add( m_labMonFraDig, str ); - QWhatsThis::add( m_inMonFraDig, str ); + TQWhatsThis::add( m_labMonFraDig, str ); + TQWhatsThis::add( m_inMonFraDig, str ); str = m_locale->translate( "If this option is checked, the currency sign " "will be prefixed (i.e. to the left of the " "value) for all positive monetary values. If " "not, it will be postfixed (i.e. to the right)." ); - QWhatsThis::add( m_chMonPosPreCurSym, str ); + TQWhatsThis::add( m_chMonPosPreCurSym, str ); str = m_locale->translate( "If this option is checked, the currency sign " "will be prefixed (i.e. to the left of the " "value) for all negative monetary values. If " "not, it will be postfixed (i.e. to the right)." ); - QWhatsThis::add( m_chMonNegPreCurSym, str ); + TQWhatsThis::add( m_chMonNegPreCurSym, str ); str = m_locale->translate( "Here you can select how a positive sign will be " "positioned. This only affects monetary values." ); - QWhatsThis::add( m_labMonPosMonSignPos, str ); - QWhatsThis::add( m_cmbMonPosMonSignPos, str ); + TQWhatsThis::add( m_labMonPosMonSignPos, str ); + TQWhatsThis::add( m_cmbMonPosMonSignPos, str ); str = m_locale->translate( "Here you can select how a negative sign will " "be positioned. This only affects monetary " "values." ); - QWhatsThis::add( m_labMonNegMonSignPos, str ); - QWhatsThis::add( m_cmbMonNegMonSignPos, str ); + TQWhatsThis::add( m_labMonNegMonSignPos, str ); + TQWhatsThis::add( m_cmbMonNegMonSignPos, str ); } diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h index e772af4d3..0ec90f392 100644 --- a/kcontrol/locale/localemon.h +++ b/kcontrol/locale/localemon.h @@ -25,7 +25,7 @@ #ifndef __KLOCALECONFIGMON_H__ #define __KLOCALECONFIGMON_H__ -#include <qwidget.h> +#include <tqwidget.h> class QCheckBox; class QComboBox; @@ -40,7 +40,7 @@ class KLocaleConfigMoney : public QWidget Q_OBJECT public: - KLocaleConfigMoney(KLocale *locale, QWidget *parent = 0, const char *name = 0); + KLocaleConfigMoney(KLocale *locale, TQWidget *parent = 0, const char *name = 0); virtual ~KLocaleConfigMoney(); void save(); @@ -60,9 +60,9 @@ signals: private slots: // Money - void slotMonCurSymChanged(const QString &t); - void slotMonDecSymChanged(const QString &t); - void slotMonThoSepChanged(const QString &t); + void slotMonCurSymChanged(const TQString &t); + void slotMonDecSymChanged(const TQString &t); + void slotMonThoSepChanged(const TQString &t); void slotMonFraDigChanged(int value); void slotMonPosPreCurSymChanged(); void slotMonNegPreCurSymChanged(); @@ -73,21 +73,21 @@ private: KLocale *m_locale; // Money - QLabel *m_labMonCurSym; - QLineEdit *m_edMonCurSym; - QLabel *m_labMonDecSym; - QLineEdit *m_edMonDecSym; - QLabel *m_labMonThoSep; - QLineEdit *m_edMonThoSep; - QLabel *m_labMonFraDig; + TQLabel *m_labMonCurSym; + TQLineEdit *m_edMonCurSym; + TQLabel *m_labMonDecSym; + TQLineEdit *m_edMonDecSym; + TQLabel *m_labMonThoSep; + TQLineEdit *m_edMonThoSep; + TQLabel *m_labMonFraDig; KIntNumInput * m_inMonFraDig; - QCheckBox *m_chMonPosPreCurSym; - QCheckBox *m_chMonNegPreCurSym; - QLabel *m_labMonPosMonSignPos; - QComboBox *m_cmbMonPosMonSignPos; - QLabel *m_labMonNegMonSignPos; - QComboBox *m_cmbMonNegMonSignPos; + TQCheckBox *m_chMonPosPreCurSym; + TQCheckBox *m_chMonNegPreCurSym; + TQLabel *m_labMonPosMonSignPos; + TQComboBox *m_cmbMonPosMonSignPos; + TQLabel *m_labMonNegMonSignPos; + TQComboBox *m_cmbMonNegMonSignPos; }; #endif diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 9e5445ded..537cc99ab 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -21,11 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qregexp.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqregexp.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -36,43 +36,43 @@ #include "localenum.moc" KLocaleConfigNumber::KLocaleConfigNumber(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { - QGridLayout *lay = new QGridLayout(this, 5, 2, + TQGridLayout *lay = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); lay->setAutoAdd(TRUE); - m_labDecSym = new QLabel(this, I18N_NOOP("&Decimal symbol:")); - m_edDecSym = new QLineEdit(this); - connect( m_edDecSym, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDecSymChanged(const QString &) ) ); + m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:")); + m_edDecSym = new TQLineEdit(this); + connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDecSymChanged(const TQString &) ) ); m_labDecSym->setBuddy(m_edDecSym); - m_labThoSep = new QLabel(this, I18N_NOOP("Tho&usands separator:")); - m_edThoSep = new QLineEdit(this); - connect( m_edThoSep, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotThoSepChanged(const QString &) ) ); + m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:")); + m_edThoSep = new TQLineEdit(this); + connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotThoSepChanged(const TQString &) ) ); m_labThoSep->setBuddy(m_edThoSep); - m_labMonPosSign = new QLabel(this, I18N_NOOP("Positive si&gn:")); - m_edMonPosSign = new QLineEdit(this); - connect( m_edMonPosSign, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotMonPosSignChanged(const QString &) ) ); + m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:")); + m_edMonPosSign = new TQLineEdit(this); + connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) ); m_labMonPosSign->setBuddy(m_edMonPosSign); - m_labMonNegSign = new QLabel(this, I18N_NOOP("&Negative sign:")); - m_edMonNegSign = new QLineEdit(this); - connect( m_edMonNegSign, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotMonNegSignChanged(const QString &) ) ); + m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:")); + m_edMonNegSign = new TQLineEdit(this); + connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) ); m_labMonNegSign->setBuddy(m_edMonNegSign); lay->setColStretch(1, 1); - connect(this, SIGNAL(localeChanged()), - SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotLocaleChanged())); } KLocaleConfigNumber::~KLocaleConfigNumber() @@ -89,26 +89,26 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; str = ent.readEntry("DecimalSymbol", - QString::fromLatin1(".")); + TQString::fromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - QString::fromLatin1(",")); + TQString::fromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(QString::fromLatin1("$0"), QString::null); + str.replace(TQString::fromLatin1("$0"), TQString::null); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - QString::fromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); @@ -116,7 +116,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", QString::fromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); @@ -134,25 +134,25 @@ void KLocaleConfigNumber::slotLocaleChanged() m_edMonNegSign->setText( m_locale->negativeSign() ); } -void KLocaleConfigNumber::slotDecSymChanged(const QString &t) +void KLocaleConfigNumber::slotDecSymChanged(const TQString &t) { m_locale->setDecimalSymbol(t); emit localeChanged(); } -void KLocaleConfigNumber::slotThoSepChanged(const QString &t) +void KLocaleConfigNumber::slotThoSepChanged(const TQString &t) { m_locale->setThousandsSeparator(t); emit localeChanged(); } -void KLocaleConfigNumber::slotMonPosSignChanged(const QString &t) +void KLocaleConfigNumber::slotMonPosSignChanged(const TQString &t) { m_locale->setPositiveSign(t); emit localeChanged(); } -void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t) +void KLocaleConfigNumber::slotMonNegSignChanged(const TQString &t) { m_locale->setNegativeSign(t); emit localeChanged(); @@ -160,7 +160,7 @@ void KLocaleConfigNumber::slotMonNegSignChanged(const QString &t) void KLocaleConfigNumber::slotTranslate() { - QString str; + TQString str; str = m_locale->translate( "Here you can define the decimal separator used " "to display numbers (i.e. a dot or a comma in " @@ -168,27 +168,27 @@ void KLocaleConfigNumber::slotTranslate() "Note that the decimal separator used to " "display monetary values has to be set " "separately (see the 'Money' tab)." ); - QWhatsThis::add( m_labDecSym, str ); - QWhatsThis::add( m_edDecSym, str ); + TQWhatsThis::add( m_labDecSym, str ); + TQWhatsThis::add( m_edDecSym, str ); str = m_locale->translate( "Here you can define the thousands separator " "used to display numbers.<p>" "Note that the thousands separator used to " "display monetary values has to be set " "separately (see the 'Money' tab)." ); - QWhatsThis::add( m_labThoSep, str ); - QWhatsThis::add( m_edThoSep, str ); + TQWhatsThis::add( m_labThoSep, str ); + TQWhatsThis::add( m_edThoSep, str ); str = m_locale->translate( "Here you can specify text used to prefix " "positive numbers. Most people leave this " "blank." ); - QWhatsThis::add( m_labMonPosSign, str ); - QWhatsThis::add( m_edMonPosSign, str ); + TQWhatsThis::add( m_labMonPosSign, str ); + TQWhatsThis::add( m_edMonPosSign, str ); str = m_locale->translate( "Here you can specify text used to prefix " "negative numbers. This should not be empty, so " "you can distinguish positive and negative " "numbers. It is normally set to minus (-)." ); - QWhatsThis::add( m_labMonNegSign, str ); - QWhatsThis::add( m_edMonNegSign, str ); + TQWhatsThis::add( m_labMonNegSign, str ); + TQWhatsThis::add( m_edMonNegSign, str ); } diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h index da75dc708..c0e8ef511 100644 --- a/kcontrol/locale/localenum.h +++ b/kcontrol/locale/localenum.h @@ -25,7 +25,7 @@ #ifndef __KLOCALECONFIGNUM_H__ #define __KLOCALECONFIGNUM_H__ -#include <qwidget.h> +#include <tqwidget.h> class QCheckBox; class QComboBox; @@ -40,7 +40,7 @@ class KLocaleConfigNumber : public QWidget public: KLocaleConfigNumber( KLocale *_locale, - QWidget *parent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~KLocaleConfigNumber( ); void save(); @@ -60,23 +60,23 @@ signals: private slots: // Numbers - void slotMonPosSignChanged(const QString &t); - void slotMonNegSignChanged(const QString &t); - void slotDecSymChanged(const QString &t); - void slotThoSepChanged(const QString &t); + void slotMonPosSignChanged(const TQString &t); + void slotMonNegSignChanged(const TQString &t); + void slotDecSymChanged(const TQString &t); + void slotThoSepChanged(const TQString &t); private: KLocale *m_locale; // Numbers - QLabel *m_labDecSym; - QLineEdit *m_edDecSym; - QLabel *m_labThoSep; - QLineEdit *m_edThoSep; - QLabel *m_labMonPosSign; - QLineEdit *m_edMonPosSign; - QLabel *m_labMonNegSign; - QLineEdit *m_edMonNegSign; + TQLabel *m_labDecSym; + TQLineEdit *m_edDecSym; + TQLabel *m_labThoSep; + TQLineEdit *m_edThoSep; + TQLabel *m_labMonPosSign; + TQLineEdit *m_edMonPosSign; + TQLabel *m_labMonNegSign; + TQLineEdit *m_edMonNegSign; }; #endif diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 97f97ba2f..1cf6b949b 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qprinter.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqprinter.h> #include <kdialog.h> #include <klocale.h> @@ -36,33 +36,33 @@ KLocaleConfigOther::KLocaleConfigOther(KLocale *locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(locale) { // Other - QGridLayout *lay = new QGridLayout(this, 3, 2, + TQGridLayout *lay = new TQGridLayout(this, 3, 2, KDialog::marginHint(), KDialog::spacingHint()); - m_labPageSize = new QLabel(this, I18N_NOOP("Paper format:")); + m_labPageSize = new TQLabel(this, I18N_NOOP("Paper format:")); lay->addWidget(m_labPageSize, 0, 0); - m_combPageSize = new QComboBox(this); + m_combPageSize = new TQComboBox(this); lay->addWidget(m_combPageSize, 0, 1); - connect( m_combPageSize, SIGNAL( activated(int) ), - SLOT( slotPageSizeChanged(int) ) ); + connect( m_combPageSize, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotPageSizeChanged(int) ) ); - m_labMeasureSystem = new QLabel(this, I18N_NOOP("Measure system:")); + m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:")); lay->addWidget(m_labMeasureSystem, 1, 0); - m_combMeasureSystem = new QComboBox(this); + m_combMeasureSystem = new TQComboBox(this); lay->addWidget(m_combMeasureSystem, 1, 1); - connect( m_combMeasureSystem, SIGNAL( activated(int) ), - SLOT( slotMeasureSystemChanged(int) ) ); + connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ), + TQT_SLOT( slotMeasureSystemChanged(int) ) ); - m_combPageSize->insertItem(QString::null); - m_combPageSize->insertItem(QString::null); - m_combMeasureSystem->insertItem(QString::null); - m_combMeasureSystem->insertItem(QString::null); + m_combPageSize->insertItem(TQString::null); + m_combPageSize->insertItem(TQString::null); + m_combMeasureSystem->insertItem(TQString::null); + m_combMeasureSystem->insertItem(TQString::null); lay->setColStretch(1, 1); lay->addRowSpacing(2, 0); @@ -80,13 +80,13 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); // ### HPB: Add code here int i; - i = ent.readNumEntry("PageSize", (int)QPrinter::A4); + i = ent.readNumEntry("PageSize", (int)TQPrinter::A4); config->deleteEntry("PageSize", false, true); if (i != m_locale->pageSize()) config->writeEntry("PageSize", @@ -108,7 +108,7 @@ void KLocaleConfigOther::slotLocaleChanged() int pageSize = m_locale->pageSize(); int i = 0; // default to A4 - if ( pageSize == (int)QPrinter::Letter ) + if ( pageSize == (int)TQPrinter::Letter ) i = 1; m_combPageSize->setCurrentItem(i); } @@ -126,10 +126,10 @@ void KLocaleConfigOther::slotTranslate() void KLocaleConfigOther::slotPageSizeChanged(int i) { - QPrinter::PageSize pageSize = QPrinter::A4; + TQPrinter::PageSize pageSize = TQPrinter::A4; if ( i == 1 ) - pageSize = QPrinter::Letter; + pageSize = TQPrinter::Letter; m_locale->setPageSize((int)pageSize); emit localeChanged(); diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h index 1c6ec0b48..a4d2dc1ba 100644 --- a/kcontrol/locale/localeother.h +++ b/kcontrol/locale/localeother.h @@ -24,7 +24,7 @@ #ifndef __KLOCALECONFIGOTHER_H__ #define __KLOCALECONFIGOTHER_H__ -#include <qwidget.h> +#include <tqwidget.h> class QLabel; class QComboBox; @@ -36,7 +36,7 @@ class KLocaleConfigOther : public QWidget Q_OBJECT public: - KLocaleConfigOther(KLocale *locale, QWidget *parent = 0, const char *name = 0); + KLocaleConfigOther(KLocale *locale, TQWidget *parent = 0, const char *name = 0); virtual ~KLocaleConfigOther(); void save(); @@ -61,10 +61,10 @@ private slots: private: KLocale *m_locale; - QLabel *m_labMeasureSystem; - QComboBox *m_combMeasureSystem; - QLabel *m_labPageSize; - QComboBox *m_combPageSize; + TQLabel *m_labMeasureSystem; + TQComboBox *m_combMeasureSystem; + TQLabel *m_labPageSize; + TQComboBox *m_combPageSize; }; #endif diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index ea077ac89..2519ea794 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -21,12 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qvaluevector.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqvaluevector.h> #include <kdialog.h> #include <ksimpleconfig.h> @@ -41,12 +41,12 @@ class StringPair { public: - QChar storeName; - QString userName; + TQChar storeName; + TQString userName; - static StringPair find( const QValueList <StringPair> &list, const QChar &c) + static StringPair find( const TQValueList <StringPair> &list, const TQChar &c) { - for ( QValueList<StringPair>::ConstIterator it = list.begin(); + for ( TQValueList<StringPair>::ConstIterator it = list.begin(); it != list.end(); ++it ) if ((*it).storeName==c) return (*it); @@ -80,7 +80,7 @@ bool operator>= (const StringPair &p1, const StringPair &p2) return ! (p1.userName>=p2.userName); } -StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s) const +StringPair KLocaleConfigTime::buildStringPair(const TQChar &c, const TQString &s) const { StringPair pair; pair.storeName=c; @@ -88,9 +88,9 @@ StringPair KLocaleConfigTime::buildStringPair(const QChar &c, const QString &s) return pair; } -QValueList<StringPair> KLocaleConfigTime::timeMap() const +TQValueList<StringPair> KLocaleConfigTime::timeMap() const { - QValueList < StringPair > list; + TQValueList < StringPair > list; list+=buildStringPair('H',m_locale->translate("HH")); list+=buildStringPair('k',m_locale->translate("hH")); list+=buildStringPair('I',m_locale->translate("PH")); @@ -104,9 +104,9 @@ QValueList<StringPair> KLocaleConfigTime::timeMap() const return list; } -QValueList <StringPair> KLocaleConfigTime::dateMap() const +TQValueList <StringPair> KLocaleConfigTime::dateMap() const { - QValueList < StringPair > list; + TQValueList < StringPair > list; list+=buildStringPair('Y',m_locale->translate("YYYY")); list+=buildStringPair('y',m_locale->translate("YY")); list+=buildStringPair('n',m_locale->translate("mM")); @@ -123,19 +123,19 @@ QValueList <StringPair> KLocaleConfigTime::dateMap() const return list; } -QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, - const QString & userFormat) const +TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list, + const TQString & userFormat) const { - QString result; + TQString result; for ( uint pos = 0; pos < userFormat.length(); ++pos ) { bool bFound = false; - for ( QValueList<StringPair>::ConstIterator it = list.begin(); + for ( TQValueList<StringPair>::ConstIterator it = list.begin(); it != list.end() && !bFound; ++it ) { - QString s = (*it).userName; + TQString s = (*it).userName; if ( userFormat.mid( pos, s.length() ) == s ) { @@ -150,7 +150,7 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, if ( !bFound ) { - QChar c = userFormat.at( pos ); + TQChar c = userFormat.at( pos ); if ( c == '%' ) result += c; @@ -161,15 +161,15 @@ QString KLocaleConfigTime::userToStore(const QValueList<StringPair> & list, return result; } -QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list, - const QString & storeFormat) const +TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list, + const TQString & storeFormat) const { - QString result; + TQString result; bool escaped = false; for ( uint pos = 0; pos < storeFormat.length(); ++pos ) { - QChar c = storeFormat.at(pos); + TQChar c = storeFormat.at(pos); if ( escaped ) { StringPair it = StringPair::find( list, c ); @@ -190,51 +190,51 @@ QString KLocaleConfigTime::storeToUser(const QValueList<StringPair> & list, } KLocaleConfigTime::KLocaleConfigTime(KLocale *_locale, - QWidget *parent, const char*name) - : QWidget(parent, name), + TQWidget *parent, const char*name) + : TQWidget(parent, name), m_locale(_locale) { // Time - QGridLayout *lay = new QGridLayout(this, 7, 2, + TQGridLayout *lay = new TQGridLayout(this, 7, 2, KDialog::marginHint(), KDialog::spacingHint()); lay->setAutoAdd(TRUE); - m_labCalendarSystem = new QLabel(this, I18N_NOOP("Calendar system:")); - m_comboCalendarSystem = new QComboBox(false, this); - connect(m_comboCalendarSystem, SIGNAL(activated(int)), - this, SLOT(slotCalendarSystemChanged(int))); - QStringList tmpCalendars; - tmpCalendars << QString::null << QString::null; + m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:")); + m_comboCalendarSystem = new TQComboBox(false, this); + connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotCalendarSystemChanged(int))); + TQStringList tmpCalendars; + tmpCalendars << TQString::null << TQString::null; m_comboCalendarSystem->insertStringList(tmpCalendars); - m_labTimeFmt = new QLabel(this, I18N_NOOP("Time format:")); - m_comboTimeFmt = new QComboBox(true, this); + m_labTimeFmt = new TQLabel(this, I18N_NOOP("Time format:")); + m_comboTimeFmt = new TQComboBox(true, this); //m_edTimeFmt = m_comboTimeFmt->lineEdit(); - //m_edTimeFmt = new QLineEdit(this); - connect( m_comboTimeFmt, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotTimeFmtChanged(const QString &) ) ); + //m_edTimeFmt = new TQLineEdit(this); + connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) ); - m_labDateFmt = new QLabel(this, I18N_NOOP("Date format:")); - m_comboDateFmt = new QComboBox(true, this); - connect( m_comboDateFmt, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDateFmtChanged(const QString &) ) ); + m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:")); + m_comboDateFmt = new TQComboBox(true, this); + connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) ); - m_labDateFmtShort = new QLabel(this, I18N_NOOP("Short date format:")); - m_comboDateFmtShort = new QComboBox(true, this); - connect( m_comboDateFmtShort, SIGNAL( textChanged(const QString &) ), - this, SLOT( slotDateFmtShortChanged(const QString &) ) ); + m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:")); + m_comboDateFmtShort = new TQComboBox(true, this); + connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ), + this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) ); - m_labWeekStartDay = new QLabel(this, I18N_NOOP("First day of the week:")); - m_comboWeekStartDay = new QComboBox(false, this); - connect (m_comboWeekStartDay, SIGNAL(activated(int)), - this, SLOT(slotWeekStartDayChanged(int))); + m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:")); + m_comboWeekStartDay = new TQComboBox(false, this); + connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotWeekStartDayChanged(int))); updateWeekDayNames(); - m_chDateMonthNamePossessive = new QCheckBox(this, I18N_NOOP("Use declined form of month name")); - connect( m_chDateMonthNamePossessive, SIGNAL( clicked() ), - SLOT( slotDateMonthNamePossChanged() ) ); + m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name")); + connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotDateMonthNamePossChanged() ) ); lay->setColStretch(1, 1); } @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - QString::fromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); - QString str; + TQString str; - str = ent.readEntry("CalendarSystem", QString::fromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", QString::fromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", QString::fromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", QString::fromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -302,26 +302,26 @@ void KLocaleConfigTime::save() KGlobal::_locale = lsave; } -void KLocaleConfigTime::showEvent( QShowEvent *e ) +void KLocaleConfigTime::showEvent( TQShowEvent *e ) { // This option makes sense only for languages where nouns are declined if ( !m_locale->nounDeclension() ) m_chDateMonthNamePossessive->hide(); - QWidget::showEvent( e ); + TQWidget::showEvent( e ); } void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) { kdDebug() << "CalendarSystem: " << calendarSystem << endl; - typedef QValueVector<QString> CalendarVector; + typedef TQValueVector<TQString> CalendarVector; CalendarVector calendars(4); calendars[0] = "gregorian"; calendars[1] = "hijri"; calendars[2] = "hebrew"; calendars[3] = "jalali"; - QString calendarType; + TQString calendarType; bool ok; calendarType = calendars.at(calendarSystem, &ok); if ( !ok ) @@ -335,14 +335,14 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) void KLocaleConfigTime::slotLocaleChanged() { - typedef QValueVector<QString> CalendarVector; + typedef TQValueVector<TQString> CalendarVector; CalendarVector calendars(4); calendars[0] = "gregorian"; calendars[1] = "hijri"; calendars[2] = "hebrew"; calendars[3] = "jalali"; - QString calendarType = m_locale->calendarType(); + TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), @@ -371,11 +371,11 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - QString::fromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; } -void KLocaleConfigTime::slotTimeFmtChanged(const QString &t) +void KLocaleConfigTime::slotTimeFmtChanged(const TQString &t) { // m_locale->setTimeFormat(t); m_locale->setTimeFormat( userToStore( timeMap(), t ) ); @@ -383,14 +383,14 @@ void KLocaleConfigTime::slotTimeFmtChanged(const QString &t) emit localeChanged(); } -void KLocaleConfigTime::slotDateFmtChanged(const QString &t) +void KLocaleConfigTime::slotDateFmtChanged(const TQString &t) { // m_locale->setDateFormat(t); m_locale->setDateFormat( userToStore( dateMap(), t ) ); emit localeChanged(); } -void KLocaleConfigTime::slotDateFmtShortChanged(const QString &t) +void KLocaleConfigTime::slotDateFmtShortChanged(const TQString &t) { //m_locale->setDateFormatShort(t); m_locale->setDateFormatShort( userToStore( dateMap(), t ) ); @@ -414,11 +414,11 @@ void KLocaleConfigTime::slotDateMonthNamePossChanged() void KLocaleConfigTime::slotTranslate() { - QString str; + TQString str; - QString sep = QString::fromLatin1("\n"); + TQString sep = TQString::fromLatin1("\n"); - QString old; + TQString old; // clear() and insertStringList also changes the current item, so // we better use save and restore here.. @@ -427,7 +427,7 @@ void KLocaleConfigTime::slotTranslate() str = i18n("some reasonable time formats for the language", "HH:MM:SS\n" "pH:MM:SS AMPM"); - m_comboTimeFmt->insertStringList(QStringList::split(sep, str)); + m_comboTimeFmt->insertStringList(TQStringList::split(sep, str)); m_comboTimeFmt->setEditText(old); old = m_comboDateFmt->currentText(); @@ -435,7 +435,7 @@ void KLocaleConfigTime::slotTranslate() str = i18n("some reasonable date formats for the language", "WEEKDAY MONTH dD YYYY\n" "SHORTWEEKDAY MONTH dD YYYY"); - m_comboDateFmt->insertStringList(QStringList::split(sep, str)); + m_comboDateFmt->insertStringList(TQStringList::split(sep, str)); m_comboDateFmt->setEditText(old); old = m_comboDateFmtShort->currentText(); @@ -444,13 +444,13 @@ void KLocaleConfigTime::slotTranslate() "YYYY-MM-DD\n" "dD.mM.YYYY\n" "DD.MM.YYYY"); - m_comboDateFmtShort->insertStringList(QStringList::split(sep, str)); + m_comboDateFmtShort->insertStringList(TQStringList::split(sep, str)); m_comboDateFmtShort->setEditText(old); updateWeekDayNames(); while ( m_comboCalendarSystem->count() < 4 ) - m_comboCalendarSystem->insertItem(QString::null); + m_comboCalendarSystem->insertItem(TQString::null); m_comboCalendarSystem->changeItem (m_locale->translate("Calendar System Gregorian", "Gregorian"), 0); m_comboCalendarSystem->changeItem @@ -480,10 +480,10 @@ void KLocaleConfigTime::slotTranslate() "given time value. Noon is treated as \"pm\" and midnight as \"am\"." "</td></tr>" "</table>"); - QWhatsThis::add( m_labTimeFmt, str ); - QWhatsThis::add( m_comboTimeFmt, str ); + TQWhatsThis::add( m_labTimeFmt, str ); + TQWhatsThis::add( m_comboTimeFmt, str ); - QString datecodes = m_locale->translate( + TQString datecodes = m_locale->translate( "<table>" "<tr><td><b>YYYY</b></td><td>The year with century as a decimal number." "</td></tr>" @@ -507,27 +507,27 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ( "<p>The text in this textbox will be used to format long " "dates. The sequences below will be replaced:</p>") + datecodes; - QWhatsThis::add( m_labDateFmt, str ); - QWhatsThis::add( m_comboDateFmt, str ); + TQWhatsThis::add( m_labDateFmt, str ); + TQWhatsThis::add( m_comboDateFmt, str ); str = m_locale->translate ( "<p>The text in this textbox will be used to format short " "dates. For instance, this is used when listing files. " "The sequences below will be replaced:</p>") + datecodes; - QWhatsThis::add( m_labDateFmtShort, str ); - QWhatsThis::add( m_comboDateFmtShort, str ); + TQWhatsThis::add( m_labDateFmtShort, str ); + TQWhatsThis::add( m_comboDateFmtShort, str ); str = m_locale->translate ("<p>This option determines which day will be considered as " "the first one of the week.</p>"); - QWhatsThis::add( m_comboWeekStartDay, str ); + TQWhatsThis::add( m_comboWeekStartDay, str ); if ( m_locale->nounDeclension() ) { str = m_locale->translate ("<p>This option determines whether possessive form of month " "names should be used in dates.</p>"); - QWhatsThis::add( m_chDateMonthNamePossessive, str ); + TQWhatsThis::add( m_chDateMonthNamePossessive, str ); } } @@ -537,7 +537,7 @@ void KLocaleConfigTime::updateWeekDayNames() for ( int i = 1; ; ++i ) { - QString str = calendar->weekDayName(i); + TQString str = calendar->weekDayName(i); bool outsideComboList = m_comboWeekStartDay->count() < i; if ( str.isNull() ) diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h index c77f00cd3..26f65579c 100644 --- a/kcontrol/locale/localetime.h +++ b/kcontrol/locale/localetime.h @@ -24,9 +24,9 @@ #ifndef __KLOCALECONFIGTIME_H__ #define __KLOCALECONFIGTIME_H__ -#include <qwidget.h> +#include <tqwidget.h> -#include <qmap.h> +#include <tqmap.h> class QCheckBox; class QComboBox; @@ -41,13 +41,13 @@ class KLocaleConfigTime : public QWidget Q_OBJECT public: - KLocaleConfigTime( KLocale *_locale, QWidget *parent=0, const char *name=0); + KLocaleConfigTime( KLocale *_locale, TQWidget *parent=0, const char *name=0); virtual ~KLocaleConfigTime( ); void save(); protected: - void showEvent( QShowEvent *e ); + void showEvent( TQShowEvent *e ); public slots: /** @@ -64,9 +64,9 @@ signals: private slots: // Time & dates - void slotTimeFmtChanged(const QString &t); - void slotDateFmtChanged(const QString &t); - void slotDateFmtShortChanged(const QString &t); + void slotTimeFmtChanged(const TQString &t); + void slotDateFmtChanged(const TQString &t); + void slotDateFmtShortChanged(const TQString &t); void slotWeekStartDayChanged(int firstDay); void slotDateMonthNamePossChanged(); void slotCalendarSystemChanged(int calendarSystem); @@ -74,29 +74,29 @@ private slots: private: void updateWeekDayNames(); - QValueList<StringPair> timeMap() const; - QValueList<StringPair> dateMap() const; + TQValueList<StringPair> timeMap() const; + TQValueList<StringPair> dateMap() const; - QString storeToUser(const QValueList<StringPair> & map, - const QString & storeFormat) const; - QString userToStore(const QValueList<StringPair> & map, - const QString & userFormat) const; - StringPair buildStringPair(const QChar &storeName, const QString &userName) const; + TQString storeToUser(const TQValueList<StringPair> & map, + const TQString & storeFormat) const; + TQString userToStore(const TQValueList<StringPair> & map, + const TQString & userFormat) const; + StringPair buildStringPair(const TQChar &storeName, const TQString &userName) const; KLocale *m_locale; // Time & dates - QLabel *m_labTimeFmt; - QComboBox *m_comboTimeFmt; - QLabel *m_labDateFmt; - QComboBox * m_comboDateFmt; - QLabel *m_labDateFmtShort; - QComboBox * m_comboDateFmtShort; - QLabel * m_labWeekStartDay; - QComboBox * m_comboWeekStartDay; - QCheckBox *m_chDateMonthNamePossessive; - QLabel * m_labCalendarSystem; - QComboBox * m_comboCalendarSystem; + TQLabel *m_labTimeFmt; + TQComboBox *m_comboTimeFmt; + TQLabel *m_labDateFmt; + TQComboBox * m_comboDateFmt; + TQLabel *m_labDateFmtShort; + TQComboBox * m_comboDateFmtShort; + TQLabel * m_labWeekStartDay; + TQComboBox * m_comboWeekStartDay; + TQCheckBox *m_chDateMonthNamePossessive; + TQLabel * m_labCalendarSystem; + TQComboBox * m_comboCalendarSystem; }; #endif diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 7a861495b..74febe07e 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -30,7 +30,7 @@ extern "C" { /* extern "C" { - KCModule *create_locale(QWidget *parent, const char* name) { + KCModule *create_locale(TQWidget *parent, const char* name) { KLocale::setMainCatalogue("kcmlocale"); return new KLocaleApplication(parent, "kcmlocale"); } diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 4ba70e1ed..de47ce661 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -20,13 +20,13 @@ */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qobjectlist.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qvgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqobjectlist.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqvgroupbox.h> #include <kaboutdata.h> #include <kconfig.h> @@ -45,8 +45,8 @@ #include "kcmlocale.h" #include "toplevel.moc" -KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/, - const QStringList &args) +KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, + const TQStringList &args) : KCModule( KLocaleFactory::instance(), parent, args) { KAboutData* aboutData = new KAboutData("kcmlocale", @@ -59,89 +59,89 @@ KLocaleApplication::KLocaleApplication(QWidget *parent, const char* /*name*/, 0, 0, "[email protected]"); setAboutData( aboutData ); - m_nullConfig = new KConfig(QString::null, false, false); - m_globalConfig = new KConfig(QString::null, false, true); + m_nullConfig = new KConfig(TQString::null, false, false); + m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(QString::fromLatin1("kcmlocale"), m_nullConfig); - QVBoxLayout *l = new QVBoxLayout(this, 0, KDialog::spacingHint()); + m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); + TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); - m_tab = new QTabWidget(this); + m_tab = new TQTabWidget(this); m_localemain = new KLocaleConfig(m_locale, this); - m_tab->addTab( m_localemain, QString::null); + m_tab->addTab( m_localemain, TQString::null); m_localenum = new KLocaleConfigNumber(m_locale, this); - m_tab->addTab( m_localenum, QString::null ); + m_tab->addTab( m_localenum, TQString::null ); m_localemon = new KLocaleConfigMoney(m_locale, this); - m_tab->addTab( m_localemon, QString::null ); + m_tab->addTab( m_localemon, TQString::null ); m_localetime = new KLocaleConfigTime(m_locale, this); - m_tab->addTab( m_localetime, QString::null ); + m_tab->addTab( m_localetime, TQString::null ); m_localeother = new KLocaleConfigOther(m_locale, this); - m_tab->addTab( m_localeother, QString::null ); + m_tab->addTab( m_localeother, TQString::null ); // Examples - m_gbox = new QVGroupBox(this); + m_gbox = new TQVGroupBox(this); m_sample = new KLocaleSample(m_locale, m_gbox); // getting signals from childs - connect(m_localemain, SIGNAL(localeChanged()), - this, SIGNAL(localeChanged())); - connect(m_localemain, SIGNAL(languageChanged()), - this, SIGNAL(languageChanged())); + connect(m_localemain, TQT_SIGNAL(localeChanged()), + this, TQT_SIGNAL(localeChanged())); + connect(m_localemain, TQT_SIGNAL(languageChanged()), + this, TQT_SIGNAL(languageChanged())); // run the slots on the childs - connect(this, SIGNAL(localeChanged()), - m_localemain, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localenum, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localemon, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localetime, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_localeother, SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localemain, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localenum, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localemon, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localetime, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_localeother, TQT_SLOT(slotLocaleChanged())); // keep the example up to date // NOTE: this will make the sample be updated 6 times the first time // because combo boxes++ emits the change signal not only when the user changes // it, but also when it's changed by the program. - connect(m_localenum, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); - connect(m_localemon, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); - connect(m_localetime, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); + connect(m_localenum, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localemon, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localetime, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); // No examples for this yet - //connect(m_localeother, SIGNAL(slotLocaleChanged()), - //m_sample, SLOT(slotLocaleChanged())); - connect(this, SIGNAL(localeChanged()), - m_sample, SLOT(slotLocaleChanged())); + //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()), + //m_sample, TQT_SLOT(slotLocaleChanged())); + connect(this, TQT_SIGNAL(localeChanged()), + m_sample, TQT_SLOT(slotLocaleChanged())); // make sure we always have translated interface - connect(this, SIGNAL(languageChanged()), - this, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localemain, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localenum, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localemon, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localetime, SLOT(slotTranslate())); - connect(this, SIGNAL(languageChanged()), - m_localeother, SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + this, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localemain, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localenum, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localemon, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localetime, TQT_SLOT(slotTranslate())); + connect(this, TQT_SIGNAL(languageChanged()), + m_localeother, TQT_SLOT(slotTranslate())); // mark it as changed when we change it. - connect(m_localemain, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localenum, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localemon, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localetime, SIGNAL(localeChanged()), - SLOT(slotChanged())); - connect(m_localeother, SIGNAL(localeChanged()), - SLOT(slotChanged())); + connect(m_localemain, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localenum, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localemon, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localetime, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); + connect(m_localeother, TQT_SIGNAL(localeChanged()), + TQT_SLOT(slotChanged())); load(); } @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - QString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; @@ -211,7 +211,7 @@ void KLocaleApplication::defaults() load( true ); } -QString KLocaleApplication::quickHelp() const +TQString KLocaleApplication::quickHelp() const { return m_locale->translate("<h1>Country/Region & Language</h1>\n" "<p>From here you can configure language, numeric, and time \n" @@ -224,11 +224,11 @@ QString KLocaleApplication::quickHelp() const void KLocaleApplication::slotTranslate() { - // The untranslated string for QLabel are stored in + // The untranslated string for TQLabel are stored in // the name() so we use that when retranslating - QObject *wc; - QObjectList *list = queryList("QWidget"); - QObjectListIt it(*list); + TQObject *wc; + TQObjectList *list = queryList("TQWidget"); + TQObjectListIt it(*list); while ( (wc = it.current()) != 0 ) { ++it; @@ -243,16 +243,16 @@ void KLocaleApplication::slotTranslate() if (::qstrcmp(wc->name(), "unnamed") == 0) continue; - if (::qstrcmp(wc->className(), "QLabel") == 0) - ((QLabel *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QGroupBox") == 0 || - ::qstrcmp(wc->className(), "QVGroupBox") == 0) - ((QGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QPushButton") == 0 || + if (::qstrcmp(wc->className(), "TQLabel") == 0) + ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 || + ::qstrcmp(wc->className(), "TQVGroupBox") == 0) + ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQPushButton") == 0 || ::qstrcmp(wc->className(), "KMenuButton") == 0) - ((QPushButton *)wc)->setText( m_locale->translate( wc->name() ) ); - else if (::qstrcmp(wc->className(), "QCheckBox") == 0) - ((QCheckBox *)wc)->setText( m_locale->translate( wc->name() ) ); + ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) ); + else if (::qstrcmp(wc->className(), "TQCheckBox") == 0) + ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) ); } delete list; diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index 746f22a69..cd27cd441 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -45,14 +45,14 @@ class KLocaleApplication : public KCModule Q_OBJECT public: - KLocaleApplication(QWidget *parent, const char *name, const QStringList &); + KLocaleApplication(TQWidget *parent, const char *name, const TQStringList &); virtual ~KLocaleApplication(); virtual void load(); virtual void load(bool useDefault); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; signals: void languageChanged(); @@ -68,20 +68,20 @@ public slots: private: KLocale *m_locale; - QTabWidget *m_tab; + TQTabWidget *m_tab; KLocaleConfig *m_localemain; KLocaleConfigNumber *m_localenum; KLocaleConfigMoney *m_localemon; KLocaleConfigTime *m_localetime; KLocaleConfigOther *m_localeother; - QGroupBox *m_gbox; + TQGroupBox *m_gbox; KLocaleSample *m_sample; KConfig * m_globalConfig; KConfig * m_nullConfig; }; -typedef KGenericFactory<KLocaleApplication, QWidget > KLocaleFactory; +typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory; #endif |