diff options
Diffstat (limited to 'tdecore')
119 files changed, 845 insertions, 845 deletions
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp index a2a067cd6..e6aa1a68a 100644 --- a/tdecore/kaboutdata.cpp +++ b/tdecore/kaboutdata.cpp @@ -23,7 +23,7 @@ #include <kaboutdata.h> #include <kstandarddirs.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> TQString KAboutPerson::name() const @@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image) TQString KAboutData::version() const { - return TQString::fromLatin1(mVersion); + return TQString::tqfromLatin1(mVersion); } TQString @@ -311,13 +311,13 @@ KAboutData::shortDescription() const TQString KAboutData::homepage() const { - return TQString::fromLatin1(mHomepageAddress); + return TQString::tqfromLatin1(mHomepageAddress); } TQString KAboutData::bugAddress() const { - return TQString::fromLatin1(mBugEmailAddress); + return TQString::tqfromLatin1(mBugEmailAddress); } const TQValueList<KAboutPerson> diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 660cc4c29..1abc8d381 100644 --- a/tdecore/kaccel.cpp +++ b/tdecore/kaccel.cpp @@ -120,10 +120,10 @@ bool qt_try_modal( TQWidget *, XEvent * ); bool KAccelEventHandler::x11Event( XEvent* pEvent ) { - if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) + if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() ) return false; - if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent ) ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->focusWidget(), &ke ); + kapp->sendEvent( kapp->tqfocusWidget(), &ke ); // If the Override event was accepted from a non-KAccel widget, // then kill the next AccelOverride in KApplication::notify. diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp index 534a5a231..6e8f08e0a 100644 --- a/tdecore/kaccelmanager.cpp +++ b/tdecore/kaccelmanager.cpp @@ -36,7 +36,7 @@ #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqtabbar.h> -#include <textview.h> +#include <tqtextview.h> #include <tqwidget.h> #include <tqwidgetstack.h> @@ -240,12 +240,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use if ( dynamic_cast<TQLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") ) continue; - int tprop = it->m_widget->metaObject()->findProperty("text", true); + int tprop = it->m_widget->tqmetaObject()->findProperty("text", true); if (tprop != -1) { if (checkChange(contents[cnt])) it->m_widget->setProperty("text", contents[cnt].accelerated()); } else { - tprop = it->m_widget->metaObject()->findProperty("title", true); + tprop = it->m_widget->tqmetaObject()->findProperty("title", true); if (tprop != -1 && checkChange(contents[cnt])) it->m_widget->setProperty("title", contents[cnt].accelerated()); } @@ -341,9 +341,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) { TQString content; TQVariant variant; - int tprop = w->metaObject()->findProperty("text", true); + int tprop = w->tqmetaObject()->findProperty("text", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); else @@ -351,9 +351,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) } if (tprop == -1) { - tprop = w->metaObject()->findProperty("title", true); + tprop = w->tqmetaObject()->findProperty("title", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); } diff --git a/tdecore/kallocator.cpp b/tdecore/kallocator.cpp index c02bbf3ff..16c1b3625 100644 --- a/tdecore/kallocator.cpp +++ b/tdecore/kallocator.cpp @@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b) void * KZoneAllocator::allocate(size_t _size) { - // Use the size of (void *) as alignment - const size_t alignment = sizeof(void *) - 1; - _size = (_size + alignment) & ~alignment; + // Use the size of (void *) as tqalignment + const size_t tqalignment = sizeof(void *) - 1; + _size = (_size + tqalignment) & ~tqalignment; if ((unsigned long) _size + blockOffset > blockSize) { diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index bf0b09142..878b6e12f 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -44,14 +44,14 @@ #include <tqstrlist.h> #include <tqfile.h> #include <tqmessagebox.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <tqlineedit.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqsessionmanager.h> #include <tqptrlist.h> #include <tqtimer.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqpixmapcache.h> #include <tqtooltip.h> #include <tqstylefactory.h> @@ -1012,7 +1012,7 @@ void KApplication::init(bool GUIenabled) // install appdata resource type KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") - + TQString::fromLatin1(name()) + '/'); + + TQString::tqfromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1291,7 +1291,7 @@ void KApplication::commitData( TQSessionManager& sm ) if ( sm.allowsInteraction() ) { TQWidgetList done; - TQWidgetList *list = TQApplication::topLevelWidgets(); + TQWidgetList *list = TQApplication::tqtopLevelWidgets(); bool canceled = false; TQWidget* w = list->first(); while ( !canceled && w ) { @@ -1302,7 +1302,7 @@ void KApplication::commitData( TQSessionManager& sm ) if ( !canceled ) done.append( w ); delete list; // one never knows... - list = TQApplication::topLevelWidgets(); + list = TQApplication::tqtopLevelWidgets(); w = list->first(); } else { w = list->next(); @@ -1449,9 +1449,9 @@ void KApplication::startKdeinit() return; // whoever held the lock has already started dcopserver } // Try to launch tdeinit. - TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit")); + TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) @@ -2208,11 +2208,11 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned void KApplication::invokeEditSlot( const char *slot ) { - TQObject *object = TQT_TQOBJECT(focusWidget()); + TQObject *object = TQT_TQOBJECT(tqfocusWidget()); if( !object ) return; - TQMetaObject *meta = object->metaObject(); + TQMetaObject *meta = object->tqmetaObject(); int idx = meta->findSlot( slot + 1, true ); if( idx < 0 ) @@ -2430,7 +2430,7 @@ void KApplication::kdisplaySetPalette() return; } #endif - TQApplication::setPalette( createApplicationPalette(), true); + TQApplication::tqsetPalette( createApplicationPalette(), true); emit kdisplayPaletteChanged(); emit appearanceChanged(); } @@ -2438,10 +2438,10 @@ void KApplication::kdisplaySetPalette() void KApplication::kdisplaySetFont() { - TQApplication::setFont(KGlobalSettings::generalFont(), true); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); + TQApplication::tqsetFont(KGlobalSettings::generalFont(), true); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts TQStyleSheet* sheet = TQStyleSheet::defaultSheet(); @@ -2777,10 +2777,10 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString command = config.readPathEntry("EmailClient"); TQString to, cc, bcc; - if (command.isEmpty() || command == TQString::fromLatin1("kmail") + if (command.isEmpty() || command == TQString::tqfromLatin1("kmail") || command.endsWith("/kmail")) { - command = TQString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); + command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); if ( !_to.isEmpty() ) { // put the whole address lists into RFC2047 encoded blobs; technically diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp index 57898da84..782b272e7 100644 --- a/tdecore/kcalendarsystem.cpp +++ b/tdecore/kcalendarsystem.cpp @@ -90,10 +90,10 @@ static int stringToInteger(const TQString & sNum, int & iLength) unsigned int iPos = 0; int result = 0; - for (; sNum.length() > iPos && sNum.at(iPos).isDigit(); iPos++) + for (; sNum.length() > iPos && sNum.tqat(iPos).isDigit(); iPos++) { result *= 10; - result += sNum.at(iPos).digitValue(); + result += sNum.tqat(iPos).digitValue(); } iLength = iPos; diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h index 6ebba1573..75b5782e4 100644 --- a/tdecore/kcalendarsystemfactory.h +++ b/tdecore/kcalendarsystemfactory.h @@ -49,7 +49,7 @@ public: * 0 is specified. * @return a KCalendarSystem object */ - static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"), + static KCalendarSystem *create (const TQString & calType = TQString::tqfromLatin1("gregorian"), const KLocale * locale = 0); /** diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp index 38ee1014a..19f9b3dc8 100644 --- a/tdecore/kcalendarsystemgregorian.cpp +++ b/tdecore/kcalendarsystemgregorian.cpp @@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const TQString KCalendarSystemGregorian::calendarName() const { - return TQString::fromLatin1("gregorian"); + return TQString::tqfromLatin1("gregorian"); } bool KCalendarSystemGregorian::isLunar() const diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp index 2824445bb..710e027d1 100644 --- a/tdecore/kcalendarsystemhebrew.cpp +++ b/tdecore/kcalendarsystemhebrew.cpp @@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const // Ok TQString KCalendarSystemHebrew::calendarName() const { - return TQString::fromLatin1("hebrew"); + return TQString::tqfromLatin1("hebrew"); } // Ok @@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(day(pDate), false); else sResult = KCalendarSystem::dayString(pDate, bShort); @@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(year(pDate), !bShort); else sResult = KCalendarSystem::yearString(pDate, bShort); @@ -684,9 +684,9 @@ static int heb2num(const TQString& str, int & iLength) { { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D0) && s[pos + 1] <= TQChar(0x05EA)) - result += (c.unicode() - 0x05D0 + 1) * 1000; + result += (c.tqunicode() - 0x05D0 + 1) * 1000; else - result += c.unicode() - 0x05D0 + 1; + result += c.tqunicode() - 0x05D0 + 1; } else if (c == TQChar(0x05D8)) { @@ -702,11 +702,11 @@ static int heb2num(const TQString& str, int & iLength) { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D9)) return -1; else - result += decadeValues[c.unicode() - 0x05D9]; + result += decadeValues[c.tqunicode() - 0x05D9]; } else if (c >= TQChar(0x05E7) && c <= TQChar(0x05EA)) { - result += (c.unicode() - 0x05E7 + 1) * 100; + result += (c.tqunicode() - 0x05E7 + 1) * 100; } else { diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp index a6487060e..90faec48e 100644 --- a/tdecore/kcalendarsystemhijri.cpp +++ b/tdecore/kcalendarsystemhijri.cpp @@ -577,7 +577,7 @@ TQDate KCalendarSystemHijri::addYears( const TQDate & date, int nyears ) const TQString KCalendarSystemHijri::calendarName() const { - return TQString::fromLatin1("hijri"); + return TQString::tqfromLatin1("hijri"); } bool KCalendarSystemHijri::isLunar() const diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp index 29798a1dd..6197ca75f 100644 --- a/tdecore/kcalendarsystemjalali.cpp +++ b/tdecore/kcalendarsystemjalali.cpp @@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const } TQString KCalendarSystemJalali::calendarName() const { - return TQString::fromLatin1("jalali"); + return TQString::tqfromLatin1("jalali"); } bool KCalendarSystemJalali::isLunar() const diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp index 24d0193b2..df07fef44 100644 --- a/tdecore/kcatalogue.cpp +++ b/tdecore/kcatalogue.cpp @@ -62,7 +62,7 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language ) // has to be set after we have the first catalog objects. d->pluralType = -1; - TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( d->language ) .arg( d->name ); diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index c423fa756..b78345276 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -31,7 +31,7 @@ #include <tqfontdatabase.h> #include <kdebug.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqmap.h> #include <tqcstring.h> #include <tqdir.h> @@ -202,7 +202,7 @@ static struct Builtin { "ascii", "iso 8859-1" }, { "x-utf-8", "utf-8" }, { "x-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt - { "unicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt + { "tqunicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt { "utf-16", "iso-10646-ucs-2" }, { "utf16", "iso-10646-ucs-2" }, { "ucs2", "iso-10646-ucs-2" }, @@ -381,11 +381,11 @@ TQChar KCharsets::fromEntity(const TQString &str) if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') { pos++; // '�', hexadeciaml character reference - TQString tmp(str.unicode()+pos, str.length()-pos); + TQString tmp(str.tqunicode()+pos, str.length()-pos); res = tmp.toInt(&ok, 16); } else { // '�', decimal character reference - TQString tmp(str.unicode()+pos, str.length()-pos); + TQString tmp(str.tqunicode()+pos, str.length()-pos); res = tmp.toInt(&ok, 10); } return res; @@ -422,14 +422,14 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len) TQString KCharsets::toEntity(const TQChar &ch) { TQString ent; - ent.sprintf("�x%x;", ch.unicode()); + ent.sprintf("�x%x;", ch.tqunicode()); return ent; } TQString KCharsets::resolveEntities( const TQString &input ) { TQString text = input; - const TQChar *p = text.unicode(); + const TQChar *p = text.tqunicode(); const TQChar *end = p + text.length(); const TQChar *ampersand = 0; bool scanForSemicolon = false; @@ -460,12 +460,12 @@ TQString KCharsets::resolveEntities( const TQString &input ) if ( entityValue.isNull() ) continue; - const uint ampersandPos = ampersand - text.unicode(); + const uint ampersandPos = ampersand - text.tqunicode(); text[ (int)ampersandPos ] = entityValue; text.remove( ampersandPos + 1, entityLength + 1 ); - p = text.unicode() + ampersandPos; - end = text.unicode() + text.length(); + p = text.tqunicode() + ampersandPos; + end = text.tqunicode() + text.length(); ampersand = 0; } @@ -477,7 +477,7 @@ TQStringList KCharsets::availableEncodingNames() TQStringList available; for ( const char* const* pos = charsets_for_encoding; *pos; ++pos ) { //kdDebug(0) << *charsets << " available" << endl; - available.append( TQString::fromLatin1( *pos )); + available.append( TQString::tqfromLatin1( *pos )); } return available; } @@ -511,7 +511,7 @@ TQStringList KCharsets::descriptiveEncodingNames() // As we are sorting, we can directly read the array language_for_encoding TQStringList encodings; for ( const LanguageForEncoding* pos = language_for_encoding; pos->index; ++pos ) { - const TQString name = TQString::fromLatin1( pos->index ); + const TQString name = TQString::tqfromLatin1( pos->index ); const TQString description = i18n( language_names[ pos->data ] ); encodings.append( i18n("Descriptive Encoding Name", "%1 ( %2 )"). arg ( description ). arg( name ) ); } @@ -573,7 +573,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const TQString dir; { KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" ); - dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); + dir = KGlobal::config()->readPathEntry("i18ndir", TQString::tqfromLatin1("/usr/share/i18n/charmaps")); } // these are codecs not included in Qt. They can be build up if the corresponding charmap @@ -584,7 +584,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const cname = name; cname = cname.upper(); - const TQString basicName = TQString::fromLatin1(cname); + const TQString basicName = TQString::tqfromLatin1(cname); kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl; TQString charMapFileName; diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index 1da17a524..06337485c 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -30,8 +30,8 @@ #include <tqpopupmenu.h> #include <tqapplication.h> #include <tqdialog.h> -#include <layout.h> -#include <textview.h> +#include <tqlayout.h> +#include <tqtextview.h> #include <tqobjectlist.h> #include <tqmenubar.h> #include <tqtabbar.h> diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 48b76f7ce..b6b4fc357 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -67,7 +67,7 @@ public: virtual const char *format( int i ) const { if ( i < (int) m_formats.count() ) - return m_formats.at( i ); + return m_formats.tqat( i ); else return 0L; } @@ -78,7 +78,7 @@ public: { int index = m_formats.find( format ); if ( index > -1 ) - return *(m_data.at( index )); + return *(m_data.tqat( index )); return TQByteArray(); } @@ -123,7 +123,7 @@ KClipboardSynchronizer::~KClipboardSynchronizer() void KClipboardSynchronizer::setupSignals() { - TQClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); disconnect( clip, NULL, this, NULL ); if( s_sync ) connect( clip, TQT_SIGNAL( selectionChanged() ), @@ -135,7 +135,7 @@ void KClipboardSynchronizer::setupSignals() void KClipboardSynchronizer::slotSelectionChanged() { - TQClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); // qDebug("*** sel changed: %i", s_blocked); if ( s_blocked || !clip->ownsSelection() ) @@ -147,7 +147,7 @@ void KClipboardSynchronizer::slotSelectionChanged() void KClipboardSynchronizer::slotClipboardChanged() { - TQClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); // qDebug("*** clip changed : %i (implicit: %i, ownz: clip: %i, selection: %i)", s_blocked, s_implicitSelection, clip->ownsClipboard(), clip->ownsSelection()); if ( s_blocked || !clip->ownsClipboard() ) @@ -161,7 +161,7 @@ void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode { // qDebug("---> setting clipboard: %p", data); - TQClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); s_blocked = true; diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index 3f0461b08..7facc86fd 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -19,7 +19,7 @@ #ifndef KCLIPBOARD_H #define KCLIPBOARD_H -#include <clipboard.h> +#include <tqclipboard.h> #include <tqmime.h> #include <tqobject.h> #include <tqstrlist.h> diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 0e1dc7ea9..3c76feca1 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -858,7 +858,7 @@ KCmdLineArgs::usage(const char *id) bool hasOptions = false; TQString optionsHeader; if (args->name) - optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name))); + optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::tqfromLatin1(args->name))); else optionsHeader = i18n("\nOptions:\n"); @@ -1239,7 +1239,7 @@ KCmdLineArgs::arg(int n) const exit(255); } - return parsedArgList->at(n); + return parsedArgList->tqat(n); } KURL diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp index 84a4cfca2..813b56027 100644 --- a/tdecore/kcompletion.cpp +++ b/tdecore/kcompletion.cpp @@ -127,7 +127,7 @@ void KCompletion::addItem( const TQString& item, uint weight ) // nodes. for ( uint i = 0; i < len; i++ ) { - node = node->insert( item.at(i), sorted ); + node = node->insert( item.tqat(i), sorted ); if ( weighted ) node->confirm( weight -1 ); // node->insert() sets weighting to 1 } @@ -419,7 +419,7 @@ TQString KCompletion::findCompletion( const TQString& string ) // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.at( i ); + ch = string.tqat( i ); node = node->find( ch ); if ( node ) @@ -463,7 +463,7 @@ TQString KCompletion::findCompletion( const TQString& string ) uint weight = temp_node->weight(); const KCompTreeNode* hit = temp_node; for( int i = 1; i < count; i++ ) { - temp_node = node->childAt(i); + temp_node = node->tqchildAt(i); if( temp_node->weight() > weight ) { hit = temp_node; weight = hit->weight(); @@ -508,7 +508,7 @@ void KCompletion::findAllCompletions(const TQString& string, // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.at( i ); + ch = string.tqat( i ); node = node->find( ch ); if ( node ) @@ -595,7 +595,7 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node, return; } - TQChar ch1 = restString.at(0); + TQChar ch1 = restString.tqat(0); TQString newRest = restString.mid(1); KCompTreeNode *child1, *child2; @@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const switch ( mode ) { case Rotation: - event = TQString::fromLatin1("Textcompletion: rotation"); + event = TQString::tqfromLatin1("Textcompletion: rotation"); text = i18n("You reached the end of the list\nof matching items.\n"); break; case PartialMatch: if ( myCompletionMode == KGlobalSettings::CompletionShell || myCompletionMode == KGlobalSettings::CompletionMan ) { - event = TQString::fromLatin1("Textcompletion: partial match"); + event = TQString::tqfromLatin1("Textcompletion: partial match"); text = i18n("The completion is ambiguous, more than one\nmatch is available.\n"); } break; case NoMatch: if ( myCompletionMode == KGlobalSettings::CompletionShell ) { - event = TQString::fromLatin1("Textcompletion: no match"); + event = TQString::tqfromLatin1("Textcompletion: no match"); text = i18n("There is no matching item available.\n"); } break; @@ -725,7 +725,7 @@ void KCompTreeNode::remove( const TQString& str ) uint i = 0; for ( ; i < string.length(); i++ ) { - child = parent->find( string.at( i ) ); + child = parent->find( string.tqat( i ) ); if ( child ) deletables.insert( i + 1, child ); else @@ -736,8 +736,8 @@ void KCompTreeNode::remove( const TQString& str ) for ( ; i >= 1; i-- ) { - parent = deletables.at( i - 1 ); - child = deletables.at( i ); + parent = deletables.tqat( i - 1 ); + child = deletables.tqat( i ); if ( child->myChildren.count() == 0 ) delete parent->myChildren.remove( child ); } @@ -874,7 +874,7 @@ KCompTreeNode *KCompTreeNodeList::remove(KCompTreeNode *item) return item; } -KCompTreeNode *KCompTreeNodeList::at(uint index) const +KCompTreeNode *KCompTreeNodeList::tqat(uint index) const { KCompTreeNode *cur = first; while (index-- && cur) cur = cur->next; diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index aead92f77..703f2c958 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -119,7 +119,7 @@ class TQPopupMenu; * tell the user) where a completion comes from. * * Note: KCompletion does not work with strings that contain 0x0 characters - * (unicode nul), as this is used internally as a delimiter. + * (tqunicode nul), as this is used internally as a delimiter. * * You may inherit from KCompletion and override makeCompletion() in * special cases (like reading directories/urls and then supplying the diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h index 3d72586f3..fcfea7243 100644 --- a/tdecore/kcompletion_private.h +++ b/tdecore/kcompletion_private.h @@ -38,7 +38,7 @@ public: KCompTreeNode *begin() const { return first; } KCompTreeNode *end() const { return last; } - KCompTreeNode *at(uint index) const; + KCompTreeNode *tqat(uint index) const; void append(KCompTreeNode *item); void prepend(KCompTreeNode *item); void insert(KCompTreeNode *after, KCompTreeNode *item); @@ -118,8 +118,8 @@ public: inline const KCompTreeChildren * children() const { return &myChildren; } - inline const KCompTreeNode * childAt(int index) const { - return myChildren.at(index); + inline const KCompTreeNode * tqchildAt(int index) const { + return myChildren.tqat(index); } inline const KCompTreeNode * firstChild() const { return myChildren.begin(); diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp index 3782ca4b2..10c91834c 100644 --- a/tdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp @@ -23,7 +23,7 @@ */ #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdom.h> #include <tqregexp.h> @@ -262,10 +262,10 @@ static TQString literalString( const TQString &s ) { bool isAscii = true; for(int i = s.length(); i--;) - if (s[i].unicode() > 127) isAscii = false; + if (s[i].tqunicode() > 127) isAscii = false; if (isAscii) - return "TQString::fromLatin1( " + quoteString(s) + " )"; + return "TQString::tqfromLatin1( " + quoteString(s) + " )"; else return "TQString::fromUtf8( " + quoteString(s) + " )"; } @@ -805,9 +805,9 @@ TQString paramString(const TQString &group, const TQValueList<Param> ¶meters } } if (arguments.isEmpty()) - return "TQString::fromLatin1( \""+group+"\" )"; + return "TQString::tqfromLatin1( \""+group+"\" )"; - return "TQString::fromLatin1( \""+paramString+"\" )"+arguments; + return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments; } /* int i is the value of the parameter */ @@ -883,12 +883,12 @@ TQString memberMutatorBody( CfgEntry *e ) out << "}" << endl << endl; } - out << "if (!" << This << "isImmutable( TQString::fromLatin1( \""; + out << "if (!" << This << "isImmutable( TQString::tqfromLatin1( \""; if (!e->param().isEmpty()) { out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( "; if ( e->paramType() == "Enum" ) { - out << "TQString::fromLatin1( "; + out << "TQString::tqfromLatin1( "; if (globalEnums) out << enumName(e->param()) << "ToString[i]"; @@ -1518,7 +1518,7 @@ int main( int argc, char **argv ) cpp << " )" << endl; cpp << " : " << inherits << "("; - if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << cfgFileName << "\" "; + if ( !cfgFileName.isEmpty() ) cpp << " TQString::tqfromLatin1( \"" << cfgFileName << "\" "; if ( cfgFileNameArg ) cpp << " config "; if ( !cfgFileName.isEmpty() ) cpp << ") "; cpp << ")" << endl; @@ -1560,7 +1560,7 @@ int main( int argc, char **argv ) for( it = choices.begin(); it != choices.end(); ++it ) { cpp << " {" << endl; cpp << " KConfigSkeleton::ItemEnum::Choice choice;" << endl; - cpp << " choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl; + cpp << " choice.name = TQString::tqfromLatin1( \"" << (*it).name << "\" );" << endl; if ( setUserTexts ) { if ( !(*it).label.isEmpty() ) cpp << " choice.label = i18n(" << quoteString((*it).label) << ");" << endl; @@ -1592,7 +1592,7 @@ int main( int argc, char **argv ) cpp << " addItem( " << itemPath(e); TQString quotedName = e->name(); addQuotes( quotedName ); - if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << e->name() << "\" )"; + if ( quotedName != key ) cpp << ", TQString::tqfromLatin1( \"" << e->name() << "\" )"; cpp << " );" << endl; } else @@ -1621,7 +1621,7 @@ int main( int argc, char **argv ) // param name. The check for isImmutable in the set* functions doesn't have the param // name available, just the corresponding enum value (int), so we need to store the // param names in a separate static list!. - cpp << " addItem( " << itemVarStr << ", TQString::fromLatin1( \""; + cpp << " addItem( " << itemVarStr << ", TQString::tqfromLatin1( \""; if ( e->paramType()=="Enum" ) cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] ); else diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp index 2f8e7eee3..3dd197b34 100644 --- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp +++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp @@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput() // Known to pass test cases while (testCases[ i ]) { - performCompare(TQString::fromLatin1(testCases[ i ])); + performCompare(TQString::tqfromLatin1(testCases[ i ])); ++i; } @@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput() i= 0; while (willFailCases[ i ]) { - performCompare(TQString::fromLatin1(willFailCases[ i ]), true); + performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true); ++i; } } @@ -77,7 +77,7 @@ void KConfigCompiler_Test::testExpectedOutput() void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail) { TQFile file(fileName); - TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref")); + TQFile fileRef(TQString::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref")); if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) ) { diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref index b3050921e..f8c4c1189 100644 --- a/tdecore/kconfig_compiler/tests/test1.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test1.cpp.ref @@ -4,66 +4,66 @@ #include "test1.h" Test1::Test1( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) ); + setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) ); KConfigSkeleton::ItemBool *itemOneOption; - itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true ); - addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) ); + itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true ); + addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) ); KConfigSkeleton::ItemInt *itemAnotherOption; - itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 ); - addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) ); + itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 ); + addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "One" ); + choice.name = TQString::tqfromLatin1( "One" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Two" ); + choice.name = TQString::tqfromLatin1( "Two" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Three" ); + choice.name = TQString::tqfromLatin1( "Three" ); valuesListOption.append( choice ); } KConfigSkeleton::ItemEnum *itemListOption; - itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); - addItem( itemListOption, TQString::fromLatin1( "ListOption" ) ); + itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); + addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) ); - setCurrentGroup( TQString::fromLatin1( "MyOptions" ) ); + setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) ); KConfigSkeleton::ItemString *itemMyString; - itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) ); - addItem( itemMyString, TQString::fromLatin1( "MyString" ) ); + itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) ); + addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) ); KConfigSkeleton::ItemPath *itemMyPath; - itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") ); - addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) ); + itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") ); + addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) ); KConfigSkeleton::ItemInt *itemAnotherOption2; - itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 ); - addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) ); + itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 ); + addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); TQStringList defaultMyStringListHidden; defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) ); defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringListHidden; - itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); - addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) ); + itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); + addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) ); KConfigSkeleton::ItemInt *itemMyNumber; - itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); - addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) ); + itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); + addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) ); } Test1::~Test1() diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref index cc2d99c69..b5a66b5cd 100644 --- a/tdecore/kconfig_compiler/tests/test1.h.ref +++ b/tdecore/kconfig_compiler/tests/test1.h.ref @@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton */ void setOneOption( bool v ) { - if (!isImmutable( TQString::fromLatin1( "OneOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "OneOption" ) )) mOneOption = v; } @@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption( int v ) { - if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) )) mAnotherOption = v; } @@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton */ void setListOption( int v ) { - if (!isImmutable( TQString::fromLatin1( "ListOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) )) mListOption = v; } @@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton */ void setMyString( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyString" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyString" ) )) mMyString = v; } @@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton */ void setMyPath( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPath" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) )) mMyPath = v; } @@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption2( int v ) { - if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) )) mAnotherOption2 = v; } @@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringListHidden( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) )) mMyStringListHidden = v; } @@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton */ void setMyNumber( int v ) { - if (!isImmutable( TQString::fromLatin1( "MyNumber" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) )) mMyNumber = v; } diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref index 2d56f7545..af8db588d 100644 --- a/tdecore/kconfig_compiler/tests/test2.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test2.cpp.ref @@ -6,90 +6,90 @@ #include <klocale.h> Test2::Test2( ) - : MyPrefs( TQString::fromLatin1( "korganizerrc" ) ) + : MyPrefs( TQString::tqfromLatin1( "korganizerrc" ) ) { - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); + mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); + mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( i18n("Confirm deletes") ); - addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) ); - mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) ); + mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( i18n("Archive File") ); - addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); + addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "standardDestination" ); + choice.name = TQString::tqfromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "askDestination" ); + choice.name = TQString::tqfromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl1" ); + choice.name = TQString::tqfromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl2" ); + choice.name = TQString::tqfromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl3" ); + choice.name = TQString::tqfromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); + mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); mDestinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) ); + addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) ); - setCurrentGroup( TQString::fromLatin1( "Views" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); - mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( i18n("Hour Size") ); - addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) ); - mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); + mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::fromLatin1( "Colors" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); - mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); + mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( i18n("Highlight color") ); - addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); + mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); - mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( i18n("Time bar") ); - addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); } Test2::~Test2() diff --git a/tdecore/kconfig_compiler/tests/test2.h.ref b/tdecore/kconfig_compiler/tests/test2.h.ref index 6c0a74d66..075f48bde 100644 --- a/tdecore/kconfig_compiler/tests/test2.h.ref +++ b/tdecore/kconfig_compiler/tests/test2.h.ref @@ -21,7 +21,7 @@ class Test2 : public MyPrefs */ void setAutoSave( bool v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -46,7 +46,7 @@ class Test2 : public MyPrefs */ void setAutoSaveInterval( int v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) mAutoSaveInterval = v; } @@ -71,7 +71,7 @@ class Test2 : public MyPrefs */ void setConfirm( bool v ) { - if (!isImmutable( TQString::fromLatin1( "Confirm" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) )) mConfirm = v; } @@ -96,7 +96,7 @@ class Test2 : public MyPrefs */ void setArchiveFile( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) + if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) mArchiveFile = v; } @@ -121,7 +121,7 @@ class Test2 : public MyPrefs */ void setDestination( int v ) { - if (!isImmutable( TQString::fromLatin1( "Destination" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Destination" ) )) mDestination = v; } @@ -146,7 +146,7 @@ class Test2 : public MyPrefs */ void setHourSize( int v ) { - if (!isImmutable( TQString::fromLatin1( "HourSize" ) )) + if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) )) mHourSize = v; } @@ -171,7 +171,7 @@ class Test2 : public MyPrefs */ void setSelectionStartsEditor( bool v ) { - if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) mSelectionStartsEditor = v; } @@ -196,7 +196,7 @@ class Test2 : public MyPrefs */ void setSelectedPlugins( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) + if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) mSelectedPlugins = v; } @@ -221,7 +221,7 @@ class Test2 : public MyPrefs */ void setHighlightColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) mHighlightColor = v; } @@ -246,7 +246,7 @@ class Test2 : public MyPrefs */ void setAgendaBgColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) mAgendaBgColor = v; } @@ -271,7 +271,7 @@ class Test2 : public MyPrefs */ void setTimeBarFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) + if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) mTimeBarFont = v; } diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref index 11fe6b38f..a47fd5213 100644 --- a/tdecore/kconfig_compiler/tests/test3.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test3.cpp.ref @@ -6,21 +6,21 @@ using namespace TestNameSpace; Test3::Test3( ) - : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test3rc" ) ) { - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); - addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); + addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); - setCurrentGroup( TQString::fromLatin1( "Blah" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Blah" ) ); - mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 ); - addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) ); - mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) ); - addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) ); - mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword ); - addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) ); + mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Blubb" ), mBlubb, 10 ); + addItem( mBlubbItem, TQString::tqfromLatin1( "Blubb" ) ); + mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BlahBlah" ), mBlahBlah, TQString::tqfromLatin1( "a string" ) ); + addItem( mBlahBlahItem, TQString::tqfromLatin1( "BlahBlah" ) ); + mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::tqfromLatin1( "MyPassword" ), mMyPassword ); + addItem( mMyPasswordItem, TQString::tqfromLatin1( "MyPassword" ) ); } Test3::~Test3() diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref index 75b1b0929..8e86d36b0 100644 --- a/tdecore/kconfig_compiler/tests/test3.h.ref +++ b/tdecore/kconfig_compiler/tests/test3.h.ref @@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton */ void setAutoSave( bool v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton */ void setBlubb( int v ) { - if (!isImmutable( TQString::fromLatin1( "Blubb" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) )) mBlubb = v; } @@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton */ void setBlahBlah( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) )) + if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) )) mBlahBlah = v; } @@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton */ void setMyPassword( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPassword" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) )) mMyPassword = v; } diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref index 6918a8c8a..0eee21488 100644 --- a/tdecore/kconfig_compiler/tests/test4.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test4.cpp.ref @@ -21,57 +21,57 @@ Test4 *Test4::self() const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" }; Test4::Test4( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Encrypt" ); + choice.name = TQString::tqfromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Decrypt" ); + choice.name = TQString::tqfromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "CrashNBurn" ); + choice.name = TQString::tqfromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "PumpNDump" ); + choice.name = TQString::tqfromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); - addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); - addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); - addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); + addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); + addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); + addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test4::~Test4() diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref index d11dd3aee..dc8691b1f 100644 --- a/tdecore/kconfig_compiler/tests/test4.h.ref +++ b/tdecore/kconfig_compiler/tests/test4.h.ref @@ -30,7 +30,7 @@ class Test4 : public KConfigSkeleton static void setColor( int i, const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) )) self()->mColor[i] = v; } @@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton static void setMouseAction( int i, int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) )) self()->mMouseAction[i] = v; } @@ -68,7 +68,7 @@ class Test4 : public KConfigSkeleton static void setFooBar( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref index 8373eb3f6..0fc90b387 100644 --- a/tdecore/kconfig_compiler/tests/test5.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test5.cpp.ref @@ -21,57 +21,57 @@ Test5 *Test5::self() const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" }; Test5::Test5( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Encrypt" ); + choice.name = TQString::tqfromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Decrypt" ); + choice.name = TQString::tqfromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "CrashNBurn" ); + choice.name = TQString::tqfromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "PumpNDump" ); + choice.name = TQString::tqfromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); - addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); - addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); - addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); + addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); + addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); + addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test5::~Test5() diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref index efb9b448a..9fadbd0ec 100644 --- a/tdecore/kconfig_compiler/tests/test5.h.ref +++ b/tdecore/kconfig_compiler/tests/test5.h.ref @@ -22,7 +22,7 @@ class Test5 : public KConfigSkeleton static void setColor( int i, const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) )) self()->mColor[i] = v; } @@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton static void setMouseAction( int i, int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) )) self()->mMouseAction[i] = v; } @@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton static void setFooBar( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref index 51b96d4c4..2b8a71d50 100644 --- a/tdecore/kconfig_compiler/tests/test6.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test6.cpp.ref @@ -4,25 +4,25 @@ #include "test6.h" Test6::Test6( const TQString & Number ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::fromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); - setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test6::~Test6() diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref index 6743d6064..18615da38 100644 --- a/tdecore/kconfig_compiler/tests/test6.h.ref +++ b/tdecore/kconfig_compiler/tests/test6.h.ref @@ -18,7 +18,7 @@ class Test6 : public KConfigSkeleton */ void setColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "Color" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::fromLatin1( "Age" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref index 91a22e036..dab0ae27d 100644 --- a/tdecore/kconfig_compiler/tests/test7.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test7.cpp.ref @@ -4,25 +4,25 @@ #include "test7.h" Test7::Test7( int Number ) - : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test7rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::fromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); - setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test7::~Test7() diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref index 8f8808da1..f67bc30cb 100644 --- a/tdecore/kconfig_compiler/tests/test7.h.ref +++ b/tdecore/kconfig_compiler/tests/test7.h.ref @@ -18,7 +18,7 @@ class Test7 : public KConfigSkeleton */ void setColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "Color" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::fromLatin1( "Age" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref index f89b7c133..8d8925c57 100644 --- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref @@ -6,14 +6,14 @@ Test8a::Test8a( KSharedConfig::Ptr config ) : KConfigSkeleton( config ) { - setCurrentGroup( TQString::fromLatin1( "Group" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); - addItem( itemFont, TQString::fromLatin1( "Font" ) ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); + addItem( itemFont, TQString::tqfromLatin1( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); - addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); + addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) ); } Test8a::~Test8a() diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref index 2e947c437..a1ac4de64 100644 --- a/tdecore/kconfig_compiler/tests/test8a.h.ref +++ b/tdecore/kconfig_compiler/tests/test8a.h.ref @@ -19,7 +19,7 @@ class Test8a : public KConfigSkeleton */ void setFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "Font" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Font" ) )) mFont = v; } @@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton */ void setTitleFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "TitleFont" ) )) + if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) )) mTitleFont = v; } diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref index e29e3c4e7..566902399 100644 --- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8b.cpp.ref @@ -22,20 +22,20 @@ Test8b::Test8b( ) : Test8a() { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Group8b1" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group8b1" ) ); KConfigSkeleton::ItemUInt *itemSomething; - itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 ); - addItem( itemSomething, TQString::fromLatin1( "Something" ) ); + itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 ); + addItem( itemSomething, TQString::tqfromLatin1( "Something" ) ); - setCurrentGroup( TQString::fromLatin1( "Group8b2" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) ); KConfigSkeleton::ItemBool *itemFooBoo; - itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false ); - addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) ); + itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false ); + addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) ); KConfigSkeleton::ItemUInt *itemPort; - itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 ); - addItem( itemPort, TQString::fromLatin1( "Port" ) ); + itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 ); + addItem( itemPort, TQString::tqfromLatin1( "Port" ) ); } Test8b::~Test8b() diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref index 4ca0d5c7f..dfc9089e3 100644 --- a/tdecore/kconfig_compiler/tests/test8b.h.ref +++ b/tdecore/kconfig_compiler/tests/test8b.h.ref @@ -21,7 +21,7 @@ class Test8b : public Test8a static void setSomething( uint v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Something" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Something" ) )) self()->mSomething = v; } @@ -40,7 +40,7 @@ class Test8b : public Test8a static void setFooBoo( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) )) self()->mFooBoo = v; } @@ -59,7 +59,7 @@ class Test8b : public Test8a static void setPort( uint v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Port" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) )) self()->mPort = v; } diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref index c5d57e4d1..606f21ed1 100644 --- a/tdecore/kconfig_compiler/tests/test9.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test9.cpp.ref @@ -4,29 +4,29 @@ #include "test9.h" Test9::Test9( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) ); + setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); TQStringList defaultMyPathList; defaultMyPathList.append( TQString::fromUtf8( "/home" ) ); defaultMyPathList.append( TQString::fromUtf8( "~" ) ); KConfigSkeleton::ItemPathList *itemMyPathList; - itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); - addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) ); + itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); + addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) ); KConfigSkeleton::ItemPathList *itemMyPathsList2; - itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() ); - addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) ); + itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() ); + addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) ); } Test9::~Test9() diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref index 66a629b48..0476c8a19 100644 --- a/tdecore/kconfig_compiler/tests/test9.h.ref +++ b/tdecore/kconfig_compiler/tests/test9.h.ref @@ -19,7 +19,7 @@ class Test9 : public KConfigSkeleton */ void setMyStringList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPathList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) )) mMyPathList = v; } @@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathsList2( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) )) mMyPathsList2 = v; } diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp index 12e16e0d4..796ec0001 100644 --- a/tdecore/kconfig_compiler/tests/test9main.cpp +++ b/tdecore/kconfig_compiler/tests/test9main.cpp @@ -32,7 +32,7 @@ int main( int, char*[] ) kdWarning() << myPathsList2 << endl; // add another path - TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde"); + TQStringList newlist = TQDir::homeDirPath() + TQString::tqfromLatin1("/.kde"); myPathsList2 = myPathsList2 + newlist; kdWarning() << myPathsList2 << endl; diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref index 7b5f55f03..00e933564 100644 --- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref @@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self() } TestDPointer::TestDPointer( ) - : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "korganizerrc" ) ) { d = new TestDPointerPrivate; mSelf = this; - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false ); + d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false ); d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); - addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); + addItem( d->autoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); + d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true ); + addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); + d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true ); d->confirmItem->setLabel( i18n("Confirm deletes") ); - addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) ); - d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile ); + addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) ); + d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile ); d->archiveFileItem->setLabel( i18n("Archive File") ); - addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); + addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "standardDestination" ); + choice.name = TQString::tqfromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "askDestination" ); + choice.name = TQString::tqfromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl1" ); + choice.name = TQString::tqfromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl2" ); + choice.name = TQString::tqfromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl3" ); + choice.name = TQString::tqfromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); + d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); d->destinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) ); + addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) ); - setCurrentGroup( TQString::fromLatin1( "Views" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); - d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 ); + d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 ); d->hourSizeItem->setLabel( i18n("Hour Size") ); - addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) ); - d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); + addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); + d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); + addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); + d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); + addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::fromLatin1( "Colors" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); - d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); + d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); d->highlightColorItem->setLabel( i18n("Highlight color") ); - addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); + d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); d->agendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); + addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); - d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont ); + d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont ); d->timeBarFontItem->setLabel( i18n("Time bar") ); - addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); + addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); } void TestDPointer::setAutoSave( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) self()->d->autoSave = v; } @@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem() void TestDPointer::setAutoSaveInterval( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) self()->d->autoSaveInterval = v; } @@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem() void TestDPointer::setConfirm( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) )) self()->d->confirm = v; } @@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem() void TestDPointer::setArchiveFile( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) self()->d->archiveFile = v; } @@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem() void TestDPointer::setDestination( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) )) self()->d->destination = v; } @@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem() void TestDPointer::setHourSize( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) )) self()->d->hourSize = v; } @@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem() void TestDPointer::setSelectionStartsEditor( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) self()->d->selectionStartsEditor = v; } @@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem() void TestDPointer::setSelectedPlugins( const TQStringList & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) self()->d->selectedPlugins = v; } @@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem() void TestDPointer::setHighlightColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) self()->d->highlightColor = v; } @@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem() void TestDPointer::setAgendaBgColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) self()->d->agendaBgColor = v; } @@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem() void TestDPointer::setTimeBarFont( const TQFont & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) self()->d->timeBarFont = v; } diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index fde08585e..633458d41 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -36,8 +36,8 @@ #include <tqdir.h> #include <tqfileinfo.h> -#include <textcodec.h> -#include <textstream.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> #include "kconfigbackend.h" #include "kconfigbase.h" @@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, if (useKDEGlobals) mGlobalFileName = KGlobal::dirs()->saveLocation("config") + - TQString::fromLatin1("kdeglobals"); + TQString::tqfromLatin1("kdeglobals"); else mGlobalFileName = TQString::null; @@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles() // Parse the general config files if (useKDEGlobals) { TQStringList kdercs = KGlobal::dirs()-> - findAllResources("config", TQString::fromLatin1("kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("kdeglobals")); #ifdef Q_WS_WIN TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); #else - TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); + TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc"); #endif if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; kdercs += KGlobal::dirs()-> - findAllResources("config", TQString::fromLatin1("system.kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; @@ -496,7 +496,7 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1()); else #endif { - rFile.at(0); + rFile.tqat(0); data = rFile.readAll(); s = data.data(); eof = s + data.size(); diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index b9a89a70c..20d3f023c 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kapplication.h> #include <kglobal.h> @@ -969,7 +969,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.at(0) == (QChar)'#' ) + if ( aValue.tqat(0) == (QChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey, return readDateTimeEntry(pKey.utf8().data(), pDefault); } -// ### currentDateTime() as fallback ? (Harri) +// ### tqcurrentDateTime() as fallback ? (Harri) TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, const TQDateTime* pDefault ) const { @@ -1034,21 +1034,21 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, if( pDefault ) return *pDefault; else - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } TQStrList list; int count = readListEntry( pKey, list, ',' ); if( count == 6 ) { - TQDate date( atoi( list.at( 0 ) ), atoi( list.at( 1 ) ), - atoi( list.at( 2 ) ) ); - TQTime time( atoi( list.at( 3 ) ), atoi( list.at( 4 ) ), - atoi( list.at( 5 ) ) ); + TQDate date( atoi( list.tqat( 0 ) ), atoi( list.tqat( 1 ) ), + atoi( list.tqat( 2 ) ) ); + TQTime time( atoi( list.tqat( 3 ) ), atoi( list.tqat( 4 ) ), + atoi( list.tqat( 5 ) ) ); return TQDateTime( date, time ); } - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } void KConfigBase::writeEntry( const TQString& pKey, const TQString& value, @@ -1121,7 +1121,7 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir ) unsigned int len = homeDir.length(); // replace by "$HOME" if possible if (len && (path.length() == len || path[len] == '/')) { - path.replace(0, len, TQString::fromLatin1("$HOME")); + path.replace(0, len, TQString::tqfromLatin1("$HOME")); return true; } else return false; @@ -1135,7 +1135,7 @@ static TQString translatePath( TQString path ) // only "our" $HOME should be interpreted path.replace('$', "$$"); - bool startsWithFile = path.startsWith("file:", false); + bool startsWithFile = path.tqstartsWith("file:", false); // return original path, if it refers to another type of URL (e.g. http:/), or // if the path is already relative to another directory @@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQStringList new_list; @@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1424,7 +1424,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1468,7 +1468,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 2f41195aa..01c758da5 100644 --- a/tdecore/kconfigbase.h +++ b/tdecore/kconfigbase.h @@ -693,7 +693,7 @@ public: * and interpret it as a date and time. * * @param pKey The key to search for. - * @param pDefault A default value ( currentDateTime() by default) + * @param pDefault A default value ( tqcurrentDateTime() by default) * returned if the key was not found or if the read value cannot be * interpreted. * @return The value for this key. @@ -707,7 +707,7 @@ public: * and interpret it as a date and time. * * @param pKey The key to search for. - * @param pDefault A default value ( currentDateTime() by default) + * @param pDefault A default value ( tqcurrentDateTime() by default) * returned if the key was not found or if the read value cannot be * interpreted. * @return The value for this key. @@ -979,7 +979,7 @@ public: void writeEntry( const TQString& pKey, const char *pValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ) - { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } /** * Write a (key/value) pair. * @@ -1000,7 +1000,7 @@ public: void writeEntry( const char *pKey, const char *pValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ) - { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } /** * Write a (key/value) pair. diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp index 82567ca0b..adebca525 100644 --- a/tdecore/kconfigdialogmanager.cpp +++ b/tdecore/kconfigdialogmanager.cpp @@ -131,13 +131,13 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it TQVariant minValue = item->minValue(); if (minValue.isValid()) { - if (widget->metaObject()->findProperty("minValue", true) != -1) + if (widget->tqmetaObject()->findProperty("minValue", true) != -1) widget->setProperty("minValue", minValue); } TQVariant maxValue = item->maxValue(); if (maxValue.isValid()) { - if (widget->metaObject()->findProperty("maxValue", true) != -1) + if (widget->tqmetaObject()->findProperty("maxValue", true) != -1) widget->setProperty("maxValue", maxValue); } if (TQWhatsThis::textFor( widget ).isEmpty()) @@ -189,7 +189,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang // it again using the super class name. This fixes a problem with using QtRuby/Korundum // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even // though it was a 'QWidget'. - changedIt = changedMap.find(childWidget->metaObject()->superClassName()); + changedIt = changedMap.find(childWidget->tqmetaObject()->tqsuperClassName()); } if (changedIt == changedMap.end()) diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index dde0779cf..a43327da1 100644 --- a/tdecore/kconfigskeleton.h +++ b/tdecore/kconfigskeleton.h @@ -376,7 +376,7 @@ public: ItemString(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! Type type = Normal); void writeConfig(KConfig * config); @@ -396,7 +396,7 @@ public: public: ItemPassword(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !! }; /** @@ -859,7 +859,7 @@ public: * @return The created item */ ItemString *addItemString(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! const TQString & key = TQString::null); /** @@ -876,7 +876,7 @@ public: * @return The created item */ ItemPassword *addItemPassword(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), + const TQString & defaultValue = TQString::tqfromLatin1(""), const TQString & key = TQString::null); /** @@ -893,7 +893,7 @@ public: * @return The created item */ ItemPath *addItemPath(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), + const TQString & defaultValue = TQString::tqfromLatin1(""), const TQString & key = TQString::null); /** diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp index 5908d8485..3742c509c 100644 --- a/tdecore/kdcoppropertyproxy.cpp +++ b/tdecore/kdcoppropertyproxy.cpp @@ -29,8 +29,8 @@ #include <tqiconset.h> #include <tqfont.h> #include <tqimage.h> -#include <brush.h> -#include <palette.h> +#include <tqbrush.h> +#include <tqpalette.h> #include <ctype.h> #include <assert.h> @@ -94,7 +94,7 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object ) res << "bool setProperty(TQCString name,TQVariant property)"; res << "TQValueList<TQCString> propertyNames(bool super)"; - TQMetaObject *metaObj = object->metaObject(); + TQMetaObject *metaObj = object->tqmetaObject(); TQStrList properties = metaObj->propertyNames( true ); TQStrListIterator it( properties ); for (; it.current(); ++it ) @@ -157,7 +157,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB stream >> b; TQValueList<TQCString> res; - TQStrList props = object->metaObject()->propertyNames( static_cast<bool>( b ) ); + TQStrList props = object->tqmetaObject()->propertyNames( static_cast<bool>( b ) ); TQStrListIterator it( props ); for (; it.current(); ++it ) res.append( it.current() ); @@ -328,7 +328,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ else propName.truncate( propName.length() - 2 ); - if ( !object->metaObject()->propertyNames( true ).contains( propName ) ) + if ( !object->tqmetaObject()->propertyNames( true ).contains( propName ) ) return false; return true; diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake index 8b3dd7afd..3a042705d 100644 --- a/tdecore/kde-config.cpp.cmake +++ b/tdecore/kde-config.cpp.cmake @@ -201,7 +201,7 @@ int main(int argc, char **argv) if (helptexts[index]) { printf("%s - %s\n", helptexts[index], i18n(helptexts[index+1]).local8Bit().data()); } else { - printf("%s", i18n("%1 - unknown type\n").arg(*it).local8Bit().data()); + printf("%s", i18n("%1 - unknown type\n").tqarg(*it).local8Bit().data()); } } return 0; @@ -226,7 +226,7 @@ int main(int argc, char **argv) else if ( type == "document" ) printResult(KGlobalSettings::documentPath()); else - fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); + fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").tqarg(type).local8Bit().data() ); return 0; } diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in index 0fdf56e3d..4accfbc85 100644 --- a/tdecore/kde-config.cpp.in +++ b/tdecore/kde-config.cpp.in @@ -32,7 +32,7 @@ bool _expandvars = false; TQString expandvars(const char *_input) { - TQString result = TQString::fromLatin1(_input); + TQString result = TQString::tqfromLatin1(_input); if (!_expandvars) return result; diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index 299ee8a80..ed1a3d60d 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -43,7 +43,7 @@ #include <tqregion.h> #include <tqstringlist.h> #include <tqpen.h> -#include <brush.h> +#include <tqbrush.h> #include <tqsize.h> #include <kurl.h> @@ -373,7 +373,7 @@ kdbgstream& kdbgstream::operator << (TQChar ch) { if (!print) return *this; if (!ch.isPrint()) - output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0'); + output += "\\x" + TQString::number( ch.tqunicode(), 16 ).rightJustify(2, '0'); else { output += ch; if (ch == (QChar)'\n') flush(); @@ -415,7 +415,7 @@ kdbgstream& kdbgstream::operator << (const TQWidget* widget) return *this; } output += string; - if (output.at(output.length() -1 ) == (QChar)'\n') + if (output.tqat(output.length() -1 ) == (QChar)'\n') { flush(); } @@ -454,7 +454,7 @@ kdbgstream& kdbgstream::operator<<( const TQRect& r ) { kdbgstream& kdbgstream::operator<<( const TQRegion& reg ) { *this<< "[ "; - TQMemArray<TQRect>rs=reg.rects(); + TQMemArray<TQRect>rs=reg.tqrects(); for (uint i=0;i<rs.size();++i) *this << TQString(TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()).arg(rs[i].width()).arg(rs[i].height() )) ; @@ -567,8 +567,8 @@ TQString kdBacktrace(int levels) for (int i = 0; i < n; ++i) s += TQString::number(i) + - TQString::fromLatin1(": ") + - TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n"); + TQString::tqfromLatin1(": ") + + TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n"); s += "]\n"; if (strings) free (strings); diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h index 477e8e43f..fc9bb1294 100644 --- a/tdecore/kdebug.h +++ b/tdecore/kdebug.h @@ -85,7 +85,7 @@ class TDECORE_EXPORT kdbgstream { kdbgstream(unsigned int _area, unsigned int _level, bool _print = true) : area(_area), level(_level), print(_print) { } kdbgstream(const char * initialString, unsigned int _area, unsigned int _level, bool _print = true) : - output(TQString::fromLatin1(initialString)), area(_area), level(_level), print(_print) { } + output(TQString::tqfromLatin1(initialString)), area(_area), level(_level), print(_print) { } /// Copy constructor kdbgstream(kdbgstream &str); kdbgstream(const kdbgstream &str) : @@ -98,7 +98,7 @@ class TDECORE_EXPORT kdbgstream { */ kdbgstream &operator<<(bool i) { if (!print) return *this; - output += TQString::fromLatin1(i ? "true" : "false"); + output += TQString::tqfromLatin1(i ? "true" : "false"); return *this; } /** @@ -216,7 +216,7 @@ class TDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const TQString& string) { if (!print) return *this; output += string; - if (output.at(output.length() -1 ) == (TQChar)'\n') + if (output.tqat(output.length() -1 ) == (TQChar)'\n') flush(); return *this; } @@ -228,7 +228,7 @@ class TDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const char *string) { if (!print) return *this; output += TQString::fromUtf8(string); - if (output.at(output.length() - 1) == (TQChar)'\n') + if (output.tqat(output.length() - 1) == (TQChar)'\n') flush(); return *this; } diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 31654134c..431a65578 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include "kurl.h" @@ -42,7 +42,7 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : KConfig(TQString::tqfromLatin1(""), bReadOnly, false) { // KConfigBackEnd will try to locate the filename that is provided // based on the resource type specified, _only_ if the filename @@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path) { int len = path.length(); - if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop")) + if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop")) return true; - else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk")) + else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk")) return true; else return false; @@ -156,7 +156,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const TQString value = readEntryUntranslated(key); TQString fName = fileName(); fName = fName.mid(fName.findRev('/')+1); - TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value; + TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value; TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data()); if (po_value == po_lookup_key) @@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const void KDesktopFile::setActionGroup(const TQString &group) { - setGroup(TQString::fromLatin1("Desktop Action ") + group); + setGroup(TQString::tqfromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasActionGroup(const TQString &group) const { - return hasGroup(TQString::fromLatin1("Desktop Action ") + group); + return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasLinkType() const { - return readEntry("Type") == TQString::fromLatin1("Link"); + return readEntry("Type") == TQString::tqfromLatin1("Link"); } bool KDesktopFile::hasApplicationType() const { - return readEntry("Type") == TQString::fromLatin1("Application"); + return readEntry("Type") == TQString::tqfromLatin1("Application"); } bool KDesktopFile::hasMimeTypeType() const { - return readEntry("Type") == TQString::fromLatin1("MimeType"); + return readEntry("Type") == TQString::tqfromLatin1("MimeType"); } bool KDesktopFile::hasDeviceType() const { - return readEntry("Type") == TQString::fromLatin1("FSDev") || - readEntry("Type") == TQString::fromLatin1("FSDevice"); + return readEntry("Type") == TQString::tqfromLatin1("FSDev") || + readEntry("Type") == TQString::tqfromLatin1("FSDevice"); } bool KDesktopFile::tryExec() const diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index fcda490b8..5aad239bd 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -248,7 +248,7 @@ void KExtendedSocket::setSocketStatus(int newstatus) void KExtendedSocket::setError(int errorcode, int syserror) { - seStatus(errorcode); + setqStatus(errorcode); d->syserror = syserror; } diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc index 330af8aa2..c3afb1b5a 100644 --- a/tdecore/kgenericfactory.tcc +++ b/tdecore/kgenericfactory.tcc @@ -125,13 +125,13 @@ namespace KDEPrivate TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - TQMetaObject *metaObject = Product::staticMetaObject(); - while ( metaObject ) + TQMetaObject *tqmetaObject = Product::tqstaticMetaObject(); + while ( tqmetaObject ) { - if ( !qstrcmp( className, metaObject->className() ) ) + if ( !qstrcmp( className, tqmetaObject->className() ) ) return create( parentWidget, widgetName, parent, name, args, Type2Type<BaseType>() ); - metaObject = metaObject->superClass(); + tqmetaObject = tqmetaObject->tqsuperClass(); } return 0; } diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index b886d8d7f..d64974be4 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -127,7 +127,7 @@ void KGlobal::setActiveInstance(KInstance *i) const TQString & KGlobal::staticQString(const char *str) { - return staticQString(TQString::fromLatin1(str)); + return staticQString(TQString::tqfromLatin1(str)); } class KStringDict : public TQDict<TQString> diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 8b0c81f1a..674f09671 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -311,14 +311,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) { int n = rexIndex.cap(1).toInt(); kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl; - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { QUObject o[2]; static_QUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { QUObject o[4]; static_QUType_QString.set(o+1,pAction->name()); @@ -327,7 +327,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); } diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index ce248ae02..c2f7a3829 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -287,7 +287,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) - << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) + << (pAction ? TQString(" name: \"%1\" shortcut: %2").tqarg(pAction->name()).tqarg(pAction->shortcut().toStringInternal()) : TQString()) << endl; } #endif @@ -365,7 +365,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) - << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) + << (pAction ? TQString(" name: \"%1\" shortcut: %2").tqarg(pAction->name()).tqarg(pAction->shortcut().toStringInternal()) : TQString()) << endl; } #endif @@ -407,14 +407,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) { int n = rexIndex.cap(1).toInt(); kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl; - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[2]; static_TQUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[4]; static_TQUType_TQString.set(o+1,pAction->name()); @@ -423,7 +423,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); } diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index ab5292684..d539f56c9 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -50,8 +50,8 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <stdlib.h> #include <kprotocolinfo.h> -#include <textcodec.h> -#include <textstream.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> #include <tqfile.h> #ifdef Q_WS_X11 @@ -451,7 +451,7 @@ TQFont KGlobalSettings::taskbarFont() TQFont KGlobalSettings::largeFont(const TQString &text) { TQFontDatabase db; - TQStringList fam = db.families(); + TQStringList fam = db.tqfamilies(); // Move a bunch of preferred fonts to the front. if (fam.remove("Arial")) diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index c8d088918..9c76c7e4d 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -153,8 +153,8 @@ TQString KIconEffect::fingerprint(int group, int state) const cached += ':'; cached += tmp.setNum(mValue[group][state]); cached += ':'; - cached += mTrans[group][state] ? TQString::fromLatin1("trans") - : TQString::fromLatin1("notrans"); + cached += mTrans[group][state] ? TQString::tqfromLatin1("trans") + : TQString::tqfromLatin1("notrans"); if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome) { cached += ':'; @@ -742,7 +742,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); - // Use NotROP to avoid having to repaint the pixmap each time. + // Use NotROP to avoid having to tqrepaint the pixmap each time. p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); p.setRasterOp(TQt::NotROP); diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 3c5cf7135..317a56add 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -223,7 +223,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) { if (groups[i] == 0L) break; - config->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); + config->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); d->mpGroups[i].size = config->readNumEntry("Size", 0); d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false); if (TQPixmap::defaultDepth()>8) @@ -686,9 +686,9 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si { key += d->mpEffect.fingerprint(group, state); if (d->mpGroups[group].dblPixels) - key += TQString::fromLatin1(":dblsize"); + key += TQString::tqfromLatin1(":dblsize"); } else - key += TQString::fromLatin1("noeffect"); + key += TQString::tqfromLatin1("noeffect"); key += '_'; key += overlayStr; diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index d30e254d0..0f7d3b605 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -451,13 +451,13 @@ TQString KIconTheme::current() KConfig *config = KGlobal::config(); KConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); - if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); + if ( *_theme == TQString::tqfromLatin1("hicolor") ) *_theme = defaultThemeName(); /* if (_theme->isEmpty()) { if (TQPixmap::defaultDepth() > 8) *_theme = defaultThemeName(); else - *_theme = TQString::fromLatin1("locolor"); + *_theme = TQString::tqfromLatin1("locolor"); }*/ return *_theme; } @@ -511,7 +511,7 @@ void KIconTheme::reconfigure() // static TQString KIconTheme::defaultThemeName() { - return TQString::fromLatin1("crystalsvg"); + return TQString::tqfromLatin1("crystalsvg"); } /*** KIconThemeDir ***/ diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp index ca41fecdf..1ce2c1348 100644 --- a/tdecore/kidna.cpp +++ b/tdecore/kidna.cpp @@ -43,12 +43,12 @@ TQString KIDNA::toAscii(const TQString &idna) { if (idna.length() && (idna[0] == (QChar)'.')) { - TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1))); + TQString host = TQString::tqfromLatin1(toAsciiCString(idna.mid(1))); if (host.isEmpty()) return TQString::null; // Error return idna[0] + host; } - return TQString::fromLatin1(toAsciiCString(idna)); + return TQString::tqfromLatin1(toAsciiCString(idna)); } TQString KIDNA::toUnicode(const TQString &idna) diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index 8fa37ebcf..440fbb5e3 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -406,7 +406,7 @@ bool Sym::initQt( int keyQt ) int symQt = keyQt & 0xffff; if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) { - m_sym = TQChar(symQt).lower().unicode(); + m_sym = TQChar(symQt).lower().tqunicode(); return true; } @@ -434,9 +434,9 @@ bool Sym::initQt( int keyQt ) bool Sym::init( const TQString& s ) { - // If it's a single character, get unicode value. + // If it's a single character, get tqunicode value. if( s.length() == 1 ) { - m_sym = s[0].lower().unicode(); + m_sym = s[0].lower().tqunicode(); return true; } @@ -498,7 +498,7 @@ TQString Sym::toString( bool bUserSpace ) const if( m_sym == 0 ) return TQString::null; - // If it's a unicode character, + // If it's a tqunicode character, #ifdef Q_WS_WIN else if( m_sym < 0x1000 ) { #else @@ -542,7 +542,7 @@ uint Sym::getModsRequired() const if( m_sym < 0x3000 ) { TQChar c(m_sym); - if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().unicode() ) + if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().tqunicode() ) return KKey::SHIFT; } @@ -823,7 +823,7 @@ uint stringUserToMod( const TQString& mod ) // Get code of just the primary key keySymQt = keyCombQt & 0xffff; - // If unicode value beneath 0x1000 (special Qt codes begin thereafter), + // If tqunicode value beneath 0x1000 (special Qt codes begin thereafter), if( keySymQt < 0x1000 ) { // For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'. // So convert it back to lowercase if SHIFT isn't held down. @@ -1041,7 +1041,7 @@ void KKey::simplify() // If this is a letter, don't remove any modifiers. if( m_sym < 0x3000 && TQChar(m_sym).isLetter() ) - m_sym = TQChar(m_sym).lower().unicode(); + m_sym = TQChar(m_sym).lower().tqunicode(); // Remove modifers from modifier list which are implicit in the symbol. // Ex. Shift+Plus => Plus (en) diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index ae7bda67f..290e23154 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -19,7 +19,7 @@ #include "config.h" #include <config.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqfile.h> #include <tqdir.h> #include <tqtimer.h> @@ -549,17 +549,17 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) We need to make sure to clear the clipboard before unloading a DSO because the DSO could have defined an object derived from QMimeSource and placed that on the clipboard. */ - /*kapp->clipboard()->clear();*/ + /*kapp->tqclipboard()->clear();*/ /* Well.. let's do something more subtle... convert the clipboard context to text. That should be safe as it only uses objects defined by Qt. */ - if( kapp->clipboard()->ownsSelection()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); + if( kapp->tqclipboard()->ownsSelection()) { + kapp->tqclipboard()->setText( + kapp->tqclipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); } - if( kapp->clipboard()->ownsClipboard()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); + if( kapp->tqclipboard()->ownsClipboard()) { + kapp->tqclipboard()->setText( + kapp->tqclipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); } } diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index bd130fb68..114746d0f 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> // getenv -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqfile.h> #include <tqprinter.h> #include <tqdatetime.h> @@ -123,7 +123,7 @@ void KLocale::initMainCatalogues(const TQString & catalog) // don't use main catalogue if we're looking up .desktop translations if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { if (maincatalogue) { - mainCatalogue = TQString::fromLatin1(maincatalogue); + mainCatalogue = TQString::tqfromLatin1(maincatalogue); } } @@ -312,13 +312,13 @@ void KLocale::initFormat() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig entry(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_country)), true); entry.setGroup("KCM Locale"); // Numeric #define readConfigEntry(key, default, save) \ - save = entry.readEntry(key, TQString::fromLatin1(default)); \ + save = entry.readEntry(key, TQString::tqfromLatin1(default)); \ save = config->readEntry(key, save); #define readConfigNumEntry(key, default, save, type) \ @@ -331,7 +331,7 @@ void KLocale::initFormat() readConfigEntry("DecimalSymbol", ".", m_decimalSymbol); readConfigEntry("ThousandsSeparator", ",", m_thousandsSeparator); - m_thousandsSeparator.replace( TQString::fromLatin1("$0"), TQString() ); + m_thousandsSeparator.replace( TQString::tqfromLatin1("$0"), TQString() ); //kdDebug(173) << "m_thousandsSeparator=" << m_thousandsSeparator << endl; readConfigEntry("PositiveSign", "", m_positiveSign); @@ -342,7 +342,7 @@ void KLocale::initFormat() readConfigEntry("MonetaryDecimalSymbol", ".", m_monetaryDecimalSymbol); readConfigEntry("MonetaryThousandsSeparator", ",", m_monetaryThousandsSeparator); - m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$0"), TQString()); + m_monetaryThousandsSeparator.replace(TQString::tqfromLatin1("$0"), TQString()); readConfigNumEntry("FracDigits", 2, m_fracDigits, int); readConfigBoolEntry("PositivePrefixCurrencySymbol", true, @@ -372,7 +372,7 @@ void KLocale::initFormat() //Grammatical //Precedence here is l10n / i18n / config file KSimpleConfig language(locate("locale", - TQString::fromLatin1("%1/entry.desktop") + TQString::tqfromLatin1("%1/entry.desktop") .arg(m_language)), true); language.setGroup("KCM Locale"); #define read3ConfigBoolEntry(key, default, save) \ @@ -404,7 +404,7 @@ bool KLocale::setCountry(const TQString & country) TQString KLocale::catalogueFileName(const TQString & language, const KCatalogue & catalog) { - TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( language ) .arg( catalog.name() ); @@ -497,7 +497,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language) TQString appName = d->appName; if (maincatalogue) { - appName = TQString::fromLatin1(maincatalogue); + appName = TQString::tqfromLatin1(maincatalogue); } // sorry, catalogueFileName requires catalog object,k which we do not have here // path finding was supposed to be moved completely to KCatalogue. The interface cannot @@ -505,7 +505,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language) // duplicated code for file path evaluation. Cleanup will follow later. We could have e.g. // a static method in KCataloge that can translate between these file names. // a stat - TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString sFileName = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( language ) .arg( appName ); // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl; @@ -1103,7 +1103,7 @@ KLocale::SignPosition KLocale::negativeMonetarySignPosition() const static inline void put_it_in( TQChar *buffer, uint& index, const TQString &s ) { for ( uint l = 0; l < s.length(); l++ ) - buffer[index++] = s.at( l ); + buffer[index++] = s.tqat( l ); } static inline void put_it_in( TQChar *buffer, uint& index, int number ) @@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const { if ( !escape ) { - if ( (TQChar(rst.at( format_index )).unicode()) == '%' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) escape = true; else - buffer.append(rst.at(format_index)); + buffer.append(rst.tqat(format_index)); } else { - switch ( TQChar(rst.at( format_index )).unicode() ) + switch ( TQChar(rst.tqat( format_index )).tqunicode() ) { case '%': buffer.append('%'); @@ -1401,7 +1401,7 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const buffer.append(calendar()->weekDayName(pDate, false)); break; default: - buffer.append(rst.at(format_index)); + buffer.append(rst.tqat(format_index)); break; } escape = false; @@ -1583,12 +1583,12 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const */ static int readInt(const TQString &str, uint &pos) { - if (!str.at(pos).isDigit()) return -1; + if (!str.tqat(pos).isDigit()) return -1; int result = 0; - for (; str.length() > pos && str.at(pos).isDigit(); pos++) + for (; str.length() > pos && str.tqat(pos).isDigit(); pos++) { result *= 10; - result += str.at(pos).digitValue(); + result += str.tqat(pos).digitValue(); } return result; @@ -1625,22 +1625,22 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok) while (fmt.length() > fmtpos && str.length() > strpos && !error) { - TQChar c = fmt.at(fmtpos++); + TQChar c = fmt.tqat(fmtpos++); if (c != (QChar)'%') { - if (c.isSpace() && str.at(strpos).isSpace()) + if (c.isSpace() && str.tqat(strpos).isSpace()) strpos++; - else if (c != str.at(strpos++)) + else if (c != str.tqat(strpos++)) error = true; } else { int j; // remove space at the beginning - if (str.length() > strpos && str.at(strpos).isSpace()) + if (str.length() > strpos && str.tqat(strpos).isSpace()) strpos++; - c = fmt.at(fmtpos++); + c = fmt.tqat(fmtpos++); switch (c) { case 'a': @@ -1765,22 +1765,22 @@ TQTime KLocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok) { if ( !(Format.length() > Formatpos && str.length() > strpos) ) goto error; - TQChar c = Format.at(Formatpos++); + TQChar c = Format.tqat(Formatpos++); if (c != (QChar)'%') { if (c.isSpace()) strpos++; - else if (c != str.at(strpos++)) + else if (c != str.tqat(strpos++)) goto error; continue; } // remove space at the beginning - if (str.length() > strpos && str.at(strpos).isSpace()) + if (str.length() > strpos && str.tqat(strpos).isSpace()) strpos++; - c = Format.at(Formatpos++); + c = Format.tqat(Formatpos++); switch (c) { case 'p': @@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat { if ( !escape ) { - if ( (TQChar(rst.at( format_index )).unicode()) == '%' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) escape = true; else - buffer[index++] = rst.at( format_index ); + buffer[index++] = rst.tqat( format_index ); } else { - switch ( TQChar(rst.at( format_index )).unicode() ) + switch ( TQChar(rst.tqat( format_index )).tqunicode() ) { case '%': buffer[index++] = (QChar)'%'; @@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat number = pTime.hour(); case 'l': // to share the code - if ( (TQChar(rst.at( format_index )).unicode()) == 'l' ) + if ( (TQChar(rst.tqat( format_index )).tqunicode()) == 'l' ) number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1; if ( number / 10 ) buffer[index++] = number / 10 + '0'; @@ -1932,7 +1932,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat } break; default: - buffer[index++] = rst.at( format_index ); + buffer[index++] = rst.tqat( format_index ); break; } escape = false; @@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat bool KLocale::use12Clock() const { - if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) || - (timeFormat().contains(TQString::fromLatin1("%l")) > 0)) + if ((timeFormat().contains(TQString::tqfromLatin1("%I")) > 0) || + (timeFormat().contains(TQString::tqfromLatin1("%l")) > 0)) return true; else return false; @@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const TQString KLocale::languages() const { - return d->languageList.join( TQString::fromLatin1(":") ); + return d->languageList.join( TQString::tqfromLatin1(":") ); } TQStringList KLocale::languageList() const @@ -2008,7 +2008,7 @@ void KLocale::initInstance() KInstance *app = KGlobal::instance(); if (app) { - KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); + KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName())); // only do this for the global instance TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding()); @@ -2265,12 +2265,12 @@ void KLocale::setMeasureSystem(MeasureSystem value) TQString KLocale::defaultLanguage() { - return TQString::fromLatin1("en_US"); + return TQString::tqfromLatin1("en_US"); } TQString KLocale::defaultCountry() { - return TQString::fromLatin1("C"); + return TQString::tqfromLatin1("C"); } const char * KLocale::encoding() const @@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const TQStringList result; - KConfig config(TQString::fromLatin1("language.codes"), true, false); + KConfig config(TQString::tqfromLatin1("language.codes"), true, false); config.setGroup("TwoLetterCodes"); for ( TQStringList::ConstIterator it = origList.begin(); @@ -2466,7 +2466,7 @@ KLocale & KLocale::operator=(const KLocale & rhs) } bool KLocale::setCharset(const TQString & ) { return true; } -TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); } +TQString KLocale::charset() const { return TQString::tqfromLatin1("UTF-8"); } // KDE4: remove #if 0 diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp index f1b7f9964..3bd6edb30 100644 --- a/tdecore/klockfile.cpp +++ b/tdecore/klockfile.cpp @@ -34,7 +34,7 @@ #include <unistd.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kde_file.h> #include <kapplication.h> diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp index 2a997deaa..c7717029c 100644 --- a/tdecore/kmacroexpander.cpp +++ b/tdecore/kmacroexpander.cpp @@ -56,7 +56,7 @@ void KMacroExpanderBase::expandMacros( TQString &str ) for (pos = 0; pos < str.length(); ) { if (ec != (QChar)0) { - if (str.unicode()[pos] != ec) + if (str.tqunicode()[pos] != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) goto nohit; @@ -109,7 +109,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) TQString rsts; while (pos < str.length()) { - TQChar cc( str.unicode()[pos] ); + TQChar cc( str.tqunicode()[pos] ); if (ec != (QChar)0) { if (cc != ec) goto nohit; @@ -205,7 +205,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) pos = pos2; return false; } - cc = str.unicode()[pos2]; + cc = str.tqunicode()[pos2]; if (cc == (QChar)'`') break; if (cc == (QChar)'\\') { @@ -383,14 +383,14 @@ template<class VT> int KMacroMapExpander<TQString,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret ) { - if (isIdentifier( str[pos - 1].unicode() )) + if (isIdentifier( str[pos - 1].tqunicode() )) return 0; uint sl; - for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++); if (!sl) return 0; TQMapConstIterator<TQString,VT> it = - macromap.find( TQConstString( str.unicode() + pos, sl ).string() ); + macromap.find( TQConstString( str.tqunicode() + pos, sl ).string() ); if (it != macromap.end()) { ret += it.data(); return sl; @@ -415,13 +415,13 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po rsl = sl + 3; } else { rpos = pos + 1; - for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++); rsl = sl + 1; } if (!sl) return 0; TQMapConstIterator<TQString,VT> it = - macromap.find( TQConstString( str.unicode() + rpos, sl ).string() ); + macromap.find( TQConstString( str.tqunicode() + rpos, sl ).string() ); if (it != macromap.end()) { ret += it.data(); return rsl; @@ -454,13 +454,13 @@ KCharMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL int KWordMacroExpander::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret ) { - if (isIdentifier( str[pos - 1].unicode() )) + if (isIdentifier( str[pos - 1].tqunicode() )) return 0; uint sl; - for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++); if (!sl) return 0; - if (expandMacro( TQConstString( str.unicode() + pos, sl ).string(), ret )) + if (expandMacro( TQConstString( str.tqunicode() + pos, sl ).string(), ret )) return sl; return 0; } @@ -481,12 +481,12 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL rsl = sl + 3; } else { rpos = pos + 1; - for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++); rsl = sl + 1; } if (!sl) return 0; - if (expandMacro( TQConstString( str.unicode() + rpos, sl ).string(), ret )) + if (expandMacro( TQConstString( str.tqunicode() + rpos, sl ).string(), ret )) return rsl; return 0; } diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index e07522fca..c219cef28 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -86,7 +86,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, // knotify daemon needs toplevel window TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); if( widget ) - winId = (int)widget->topLevelWidget()->winId(); + winId = (int)widget->tqtopLevelWidget()->winId(); TQByteArray data; TQDataStream ds(data, IO_WriteOnly); @@ -126,20 +126,20 @@ int KNotifyClient::event( int winId, StandardEvent type, const TQString& text ) TQString message; switch ( type ) { case cannotOpenFile: - message = TQString::fromLatin1("cannotopenfile"); + message = TQString::tqfromLatin1("cannotopenfile"); break; case warning: - message = TQString::fromLatin1("warning"); + message = TQString::tqfromLatin1("warning"); break; case fatalError: - message = TQString::fromLatin1("fatalerror"); + message = TQString::tqfromLatin1("fatalerror"); break; case catastrophe: - message = TQString::fromLatin1("catastrophe"); + message = TQString::tqfromLatin1("catastrophe"); break; case notification: // fall through default: - message = TQString::fromLatin1("notification"); + message = TQString::tqfromLatin1("notification"); break; } diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 8cd25569b..9cc7b5635 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -22,7 +22,7 @@ #include "kpalette.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kstandarddirs.h> #include <kglobal.h> #include <ksavefile.h> @@ -176,7 +176,7 @@ KPalette::color(int index) if ((index < 0) || (index >= nrColors())) return TQColor(); - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return TQColor(); @@ -202,7 +202,7 @@ KPalette::colorName(int index) if ((index < 0) || (index >= nrColors())) return TQString::null; - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return TQString::null; @@ -227,7 +227,7 @@ KPalette::changeColor(int index, if ((index < 0) || (index >= nrColors())) return -1; - kolor *node = mKolorList.at(index); + kolor *node = mKolorList.tqat(index); if (!node) return -1; diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index d8170c0a8..6774eee5f 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -214,7 +214,7 @@ void KProcessController::slotDoHousekeeping() if( waitpid( *uit, 0, WNOHANG ) > 0 ) { uit = unixProcessList.remove( uit ); - deref(); // counterpart to addProcess, can invalidate 'this' + deref(); // counterpart to addProcess, can tqinvalidate 'this' } else ++uit; } diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index 7e9941717..65496bf10 100644 --- a/tdecore/kprocess.h +++ b/tdecore/kprocess.h @@ -606,7 +606,7 @@ signals: * data structures before returning from the slot. * Example: * \code - * TQString myBuf = TQString::fromLatin1(buffer, buflen); + * TQString myBuf = TQString::tqfromLatin1(buffer, buflen); * \endcode **/ void receivedStdout(KProcess *proc, char *buffer, int buflen); diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp index 6b6d4b366..9159edab5 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/kprocio.cpp @@ -27,7 +27,7 @@ #include "kprocio.h" #include <kdebug.h> -#include <textcodec.h> +#include <tqtextcodec.h> class KProcIOPrivate { public: diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h index 3dceb9c1b..6c3d482bb 100644 --- a/tdecore/kprocio.h +++ b/tdecore/kprocio.h @@ -35,7 +35,7 @@ class TQTextCodec; * buffer and maintained/freed appropriately. There is no need * to be concerned with wroteStdin() signals _at_all_. * @li readln() reads a line of data and buffers any leftovers. - * @li Conversion from/to unicode. + * @li Conversion from/to tqunicode. * * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs(). * diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 943ad1b9a..93692c735 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -392,7 +392,7 @@ TQString KProtocolInfo::icon( const TQString& _protocol ) { KProtocolInfo::Ptr prot = KProtocolInfoFactory::self()->findProtocol(_protocol); if ( !prot ) - return TQString::fromLatin1("unknown"); + return TQString::tqfromLatin1("unknown"); return prot->m_icon; } diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h index cc5ff0ea6..8e6baac98 100644 --- a/tdecore/kregexp.h +++ b/tdecore/kregexp.h @@ -30,7 +30,7 @@ class KRegExpPrivate; * * This was implemented * because TQRegExp did not support back-references. It now does and - * is recommended over KRegExp because of the unicode support and the + * is recommended over KRegExp because of the tqunicode support and the * more powerful API. * * Back-references are parts of a regexp grouped with parentheses. If a @@ -53,7 +53,7 @@ class KRegExpPrivate; * Weis * \endcode * - * Please notice that KRegExp does @em not support unicode. + * Please notice that KRegExp does @em not support tqunicode. * * @author Torben Weis <weis@kde.org> */ diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp index d9a374d0c..dabdc7afa 100644 --- a/tdecore/krfcdate.cpp +++ b/tdecore/krfcdate.cpp @@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) mday = l[2].toUInt(); // Z suffix means UTC. - if ((QChar)'Z' == timeString.at(timeString.length() - 1)) { + if ((QChar)'Z' == timeString.tqat(timeString.length() - 1)) { timeString.remove(timeString.length() - 1, 1); } diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp index 9661875b7..031e27abf 100644 --- a/tdecore/krootprop.cpp +++ b/tdecore/krootprop.cpp @@ -27,7 +27,7 @@ #include "klocale.h" #include "kcharsets.h" #include "kapplication.h" -#include <textstream.h> +#include <tqtextstream.h> #include <X11/Xlib.h> #include <X11/Xatom.h> diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp index cddf44bc5..72625a9ca 100644 --- a/tdecore/ksavefile.cpp +++ b/tdecore/ksavefile.cpp @@ -55,7 +55,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode) return; } - if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode)) + if (mTempFile.create(real_filename, TQString::tqfromLatin1(".new"), mode)) { mFileName = real_filename; // Set filename upon success diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h index e035115a9..7cf4bc7e9 100644 --- a/tdecore/ksavefile.h +++ b/tdecore/ksavefile.h @@ -140,7 +140,7 @@ public: */ static bool backupFile( const TQString& filename, const TQString& backupDir = TQString::null, - const TQString& backupExtension = TQString::fromLatin1( "~" ) ); + const TQString& backupExtension = TQString::tqfromLatin1( "~" ) ); private: TQString mFileName; diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp index 7e4eda947..9a9aacfbe 100644 --- a/tdecore/kshell.cpp +++ b/tdecore/kshell.cpp @@ -72,7 +72,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) do { if (pos >= args.length()) goto okret; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (c.isSpace()); TQString cret; if ((flags & TildeExpand) && c == (QChar)'~') { @@ -80,7 +80,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) for (; ; pos++) { if (pos >= args.length()) break; - c = args.unicode()[pos]; + c = args.tqunicode()[pos]; if (c == (QChar)'/' || c.isSpace()) break; if (isQuoteMeta( c )) { @@ -91,7 +91,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) if ((flags & AbortOnMeta) && isMeta( c )) goto metaerr; } - TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() ); + TQString ccret = homeDir( TQConstString( args.tqunicode() + opos, pos - opos ).string() ); if (ccret.isEmpty()) { pos = opos; c = (QChar)'~'; @@ -129,20 +129,20 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) do { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (c != (QChar)'\''); - cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string(); + cret += TQConstString( args.tqunicode() + spos, pos - spos - 1 ).string(); } else if (c == (QChar)'"') { for (;;) { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c == (QChar)'"') break; if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c != (QChar)'"' && c != (QChar)'\\' && !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))) cret += (QChar)'\\'; @@ -155,13 +155,13 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) for (;;) { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c == (QChar)'\'') break; if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; switch (c) { case 'a': cret += (QChar)'\a'; break; case 'b': cret += (QChar)'\b'; break; @@ -212,7 +212,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (!c.isSpace() && !((flags & AbortOnMeta) ? isMeta( c ) : isQuoteMeta( c ))) cret += '\\'; @@ -222,7 +222,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) } if (pos >= args.length()) break; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (!c.isSpace()); ret += cret; firstword = false; @@ -265,7 +265,7 @@ TQString KShell::joinArgs( const TQStringList &args ) ret.append( q ).append( q ); else { for (uint i = 0; i < (*it).length(); i++) - if (isSpecial((*it).unicode()[i])) { + if (isSpecial((*it).tqunicode()[i])) { TQString tmp(*it); tmp.replace( q, "'\\''" ); ret += q; @@ -294,7 +294,7 @@ TQString KShell::joinArgs( const char * const *args, int nargs ) else { TQString tmp( TQFile::decodeName( *argp ) ); for (uint i = 0; i < tmp.length(); i++) - if (isSpecial(tmp.unicode()[i])) { + if (isSpecial(tmp.tqunicode()[i])) { tmp.replace( q, "'\\''" ); ret += q; tmp += q; @@ -319,10 +319,10 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) ret.append( q ).append( q ); else { for (uint i = 0; i < (*it).length(); i++) - if (isSpecial((*it).unicode()[i])) { + if (isSpecial((*it).tqunicode()[i])) { ret.append( '$' ).append( q ); for (uint pos = 0; pos < (*it).length(); pos++) { - int c = (*it).unicode()[pos]; + int c = (*it).tqunicode()[pos]; if (c < 32) { ret += bs; switch (c) { @@ -357,10 +357,10 @@ TQString KShell::tildeExpand( const TQString &fname ) if (fname[0] == (QChar)'~') { int pos = fname.find( '/' ); if (pos < 0) - return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() ); - TQString ret = homeDir( TQConstString( fname.unicode() + 1, pos - 1 ).string() ); + return homeDir( TQConstString( fname.tqunicode() + 1, fname.length() - 1 ).string() ); + TQString ret = homeDir( TQConstString( fname.tqunicode() + 1, pos - 1 ).string() ); if (!ret.isNull()) - ret += TQConstString( fname.unicode() + pos, fname.length() - pos ).string(); + ret += TQConstString( fname.tqunicode() + pos, fname.length() - pos ).string(); return ret; } return fname; diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 6b4e13a14..15597826d 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -38,7 +38,7 @@ #include "ksimpleconfig.h" KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : KConfig(TQString::tqfromLatin1(""), bReadOnly, false) { // the difference between KConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp index 899f32dba..6ce802716 100644 --- a/tdecore/ksockaddr.cpp +++ b/tdecore/ksockaddr.cpp @@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const return i18n("<empty>"); } - return TQString::fromLatin1(buf); // FIXME! What's the encoding? + return TQString::tqfromLatin1(buf); // FIXME! What's the encoding? } TQString KInetSocketAddress::serviceName() const @@ -717,7 +717,7 @@ TQString KInetSocketAddress::addrToString(int family, const void* addr) { char buf[INET6_ADDRSTRLEN+1]; - return TQString::fromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN)); + return TQString::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN)); } bool KInetSocketAddress::stringToAddr(int family, const char *text, void *dest) diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 55a3b5e8c..038b5ce06 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -159,7 +159,7 @@ TQStringList KStandardDirs::allTypes() const { TQStringList list; for (int i = 0; types[i] != 0; ++i) - list.append(TQString::fromLatin1(types[i])); + list.append(TQString::tqfromLatin1(types[i])); return list; } @@ -189,7 +189,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!prefixes.contains(dir)) { @@ -209,7 +209,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgconf_prefixes.contains(dir)) { @@ -229,7 +229,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) + if (dir.tqat(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgdata_prefixes.contains(dir)) { @@ -271,7 +271,7 @@ bool KStandardDirs::addResourceType( const char *type, relatives.insert(type, rels); } TQString copy = relativename; - if (copy.at(copy.length() - 1) != QChar('/')) + if (copy.tqat(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!rels->contains(copy)) { if (priority) @@ -301,7 +301,7 @@ bool KStandardDirs::addResourceDir( const char *type, absolutes.insert(type, paths); } TQString copy = absdir; - if (copy.at(copy.length() - 1) != QChar('/')) + if (copy.tqat(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!paths->contains(copy)) { @@ -452,7 +452,7 @@ bool KStandardDirs::exists(const TQString &fullPath) { KDE_struct_stat buff; if (access(TQFile::encodeName(fullPath), R_OK) == 0 && KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0) - if (fullPath.at(fullPath.length() - 1) != QChar('/')) { + if (fullPath.tqat(fullPath.length() - 1) != QChar('/')) { if (S_ISREG( buff.st_mode )) return true; } else @@ -478,9 +478,9 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, return; #ifdef Q_WS_WIN - assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\')); + assert(path.tqat(path.length() - 1) == QChar('/') || path.tqat(path.length() - 1) == QChar('\\')); #else - assert(path.at(path.length() - 1) == QChar('/')); + assert(path.tqat(path.length() - 1) == QChar('/')); #endif struct dirent *ep; @@ -492,7 +492,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == TQChar('~').latin1()) + if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == TQChar('~').latin1()) continue; if (!recursive && !regexp.exactMatch(fn)) @@ -569,9 +569,9 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (prefix.isEmpty()) //for sanity return; #ifdef Q_WS_WIN - assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\')); + assert(prefix.tqat(prefix.length() - 1) == QChar('/') || prefix.tqat(prefix.length() - 1) == QChar('\\')); #else - assert(prefix.at(prefix.length() - 1) == QChar('/')); + assert(prefix.tqat(prefix.length() - 1) == QChar('/')); #endif KDE_struct_stat buff; @@ -591,7 +591,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~')) + if (fn == _dot || fn == _dotdot || fn.tqat(fn.length() - 1) == QChar('~')) continue; if ( !pathExp.exactMatch(fn) ) @@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type) #else //UNIX if (relink) { - TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir()); + TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir()); if (srv.isEmpty()) - srv = findExe(TQString::fromLatin1("lnusertemp")); + srv = findExe(TQString::tqfromLatin1("lnusertemp")); if (!srv.isEmpty()) { system(TQFile::encodeName(srv)+" "+type); @@ -1130,7 +1130,7 @@ TQString KStandardDirs::saveLocation(const char *type, if (KDE_stat(TQFile::encodeName(fullPath), &st) != 0 || !(S_ISDIR(st.st_mode))) { if(!create) { #ifndef NDEBUG - kdDebug() << TQString("save location %1 doesn't exist").arg(fullPath) << endl; + kdDebug() << TQString("save location %1 doesn't exist").tqarg(fullPath) << endl; #endif return fullPath; } @@ -1176,7 +1176,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode) uint len = target.length(); // append trailing slash if missing - if (dir.at(len - 1) != QChar('/')) + if (dir.tqat(len - 1) != QChar('/')) target += QChar('/'); TQString base(""); @@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir() if (!s->defaultbindir.isEmpty()) return s->defaultbindir; #ifdef Q_WS_WIN - s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); #else //UNIX s->defaultbindir = __KDE_BINDIR; if (s->defaultbindir.isEmpty()) - s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); #endif if (s->defaultbindir.isEmpty()) kdWarning() << "KStandardDirs::kfsstnd_defaultbindir(): default binary KDE dir not found!" << endl; @@ -1543,7 +1543,7 @@ bool KStandardDirs::addCustomized(KConfig *config) addedCustoms = true; // reading the prefixes in - TQString group = TQString::fromLatin1("Directories"); + TQString group = TQString::tqfromLatin1("Directories"); config->setGroup(group); TQString kioskAdmin = config->readEntry("kioskAdmin"); @@ -1623,7 +1623,7 @@ bool KStandardDirs::addCustomized(KConfig *config) if (profiles.isEmpty()) break; profile = profiles.back(); - group = TQString::fromLatin1("Directories-%1").arg(profile); + group = TQString::tqfromLatin1("Directories-%1").arg(profile); profiles.pop_back(); priority = true; } diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp index f201b70c0..00a9f5b81 100644 --- a/tdecore/kstartupinfo.cpp +++ b/tdecore/kstartupinfo.cpp @@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "new: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "new: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); msg = check_required_startup_fields( msg, data_P, qt_xscreen()); kdDebug( 172 ) << "sending " << msg << endl; @@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P, { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "new: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "new: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P )); #ifdef KSTARTUPINFO_ALL_DEBUG @@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "change: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "change: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); @@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P, { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "change: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "change: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; @@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P ) if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); return true; @@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P ) { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; #endif @@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat // if( id_P.none()) // id may be none, the pids and hostname matter then // return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "remove: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "remove: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); @@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P, { // if( id_P.none()) // id may be none, the pids and hostname matter then // return false; - TQString msg = TQString::fromLatin1( "remove: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "remove: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; @@ -955,14 +955,14 @@ const TQCString& KStartupInfoId::id() const TQString KStartupInfoId::to_text() const { - return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id())); + return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id())); } KStartupInfoId::KStartupInfoId( const TQString& txt_P ) { d = new KStartupInfoIdPrivate; TQStringList items = get_fields( txt_P ); - const TQString id_str = TQString::fromLatin1( "ID=" ); + const TQString id_str = TQString::tqfromLatin1( "ID=" ); for( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) @@ -1124,34 +1124,34 @@ TQString KStartupInfoData::to_text() const { TQString ret = ""; if( !d->bin.isEmpty()) - ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); + ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); if( !d->name.isEmpty()) - ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); + ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); if( !d->description.isEmpty()) - ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); + ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); if( !d->icon.isEmpty()) - ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon ); + ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon ); if( d->desktop != 0 ) - ret += TQString::fromLatin1( " DESKTOP=%1" ) + ret += TQString::tqfromLatin1( " DESKTOP=%1" ) .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0 if( !d->wmclass.isEmpty()) - ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); + ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); if( !d->hostname.isEmpty()) - ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); + ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); for( TQValueList< pid_t >::ConstIterator it = d->pids.begin(); it != d->pids.end(); ++it ) - ret += TQString::fromLatin1( " PID=%1" ).arg( *it ); + ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it ); if( d->silent != Unknown ) - ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); + ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); if( d->timestamp != -1U ) - ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); + ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); if( d->screen != -1 ) - ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen ); + ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen ); if( d->xinerama != -1 ) - ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); + ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); if( d->launched_by != 0 ) - ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by ); + ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by ); return ret; } @@ -1159,19 +1159,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P ) { d = new KStartupInfoDataPrivate; TQStringList items = get_fields( txt_P ); - const TQString bin_str = TQString::fromLatin1( "BIN=" ); - const TQString name_str = TQString::fromLatin1( "NAME=" ); - const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" ); - const TQString icon_str = TQString::fromLatin1( "ICON=" ); - const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" ); - const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" ); - const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd - const TQString pid_str = TQString::fromLatin1( "PID=" ); // SELI nonstd - const TQString silent_str = TQString::fromLatin1( "SILENT=" ); - const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" ); - const TQString screen_str = TQString::fromLatin1( "SCREEN=" ); - const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" ); - const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" ); + const TQString bin_str = TQString::tqfromLatin1( "BIN=" ); + const TQString name_str = TQString::tqfromLatin1( "NAME=" ); + const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" ); + const TQString icon_str = TQString::tqfromLatin1( "ICON=" ); + const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" ); + const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" ); + const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd + const TQString pid_str = TQString::tqfromLatin1( "PID=" ); // SELI nonstd + const TQString silent_str = TQString::tqfromLatin1( "SILENT=" ); + const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" ); + const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" ); + const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" ); + const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" ); for( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index d33c3c924..dfabb49ea 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -62,7 +62,7 @@ TQString KStringHandler::word( const TQString &text , const char *range ) // Extract words // int wordsToExtract = cnt-pos+1; - TQStringList::Iterator it = list.at( pos); + TQStringList::Iterator it = list.tqat( pos); while ( (it != list.end()) && (wordsToExtract-- > 0)) { @@ -91,7 +91,7 @@ TQString KStringHandler::insword( const TQString &text , const TQString &word , if ( pos >= list.count() ) list.append( word ); else - list.insert( list.at(pos) , word ); + list.insert( list.tqat(pos) , word ); // Rejoin return list.join( " " ); @@ -112,7 +112,7 @@ TQString KStringHandler::setword( const TQString &text , const TQString &word , list.append( word ); else { - list.insert( list.remove( list.at(pos) ) , word ); + list.insert( list.remove( list.tqat(pos) ) , word ); } // Rejoin @@ -140,7 +140,7 @@ TQString KStringHandler::remrange( const TQString &text , const char *range ) // Remove that range of words // int wordsToDelete = cnt-pos+1; - TQStringList::Iterator it = list.at( pos); + TQStringList::Iterator it = list.tqat( pos); while ( (it != list.end()) && (wordsToDelete-- > 0)) it = list.remove( it ); @@ -159,7 +159,7 @@ TQString KStringHandler::remword( const TQString &text , uint pos ) TQStringList list = TQStringList::split( " ", text, true ); if ( pos < list.count() ) - list.remove( list.at( pos ) ); + list.remove( list.tqat( pos ) ); // Rejoin return list.join( " " ); @@ -425,8 +425,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa return filename.find(pattern.mid(1, pattern_len - 2)) != -1; } - const TQChar *c1 = pattern.unicode(); - const TQChar *c2 = filename.unicode(); + const TQChar *c1 = pattern.tqunicode(); + const TQChar *c2 = filename.tqunicode(); int cnt = 1; while ( cnt < pattern_len && *c1++ == *c2++ ) ++cnt; @@ -436,8 +436,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa // Patterns like "*~", "*.extension" if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len ) { - const TQChar *c1 = pattern.unicode() + pattern_len - 1; - const TQChar *c2 = filename.unicode() + len - 1; + const TQChar *c1 = pattern.tqunicode() + pattern_len - 1; + const TQChar *c2 = filename.tqunicode() + len - 1; int cnt = 1; while ( cnt < pattern_len && *c1-- == *c2-- ) ++cnt; @@ -556,10 +556,10 @@ KStringHandler::tagURLs( const TQString& text ) TQString KStringHandler::obscure( const TQString &str ) { TQString result; - const TQChar *unicode = str.unicode(); + const TQChar *tqunicode = str.tqunicode(); for ( uint i = 0; i < str.length(); ++i ) - result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] : - TQChar( 0x1001F - unicode[ i ].unicode() ); + result += ( tqunicode[ i ].tqunicode() < 0x21 ) ? tqunicode[ i ] : + TQChar( 0x1001F - tqunicode[ i ].tqunicode() ); return result; } diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index 441f6d530..3a655d617 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/ksycoca.cpp @@ -178,7 +178,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) // We open a dummy database instead. //kdDebug(7011) << "No database, opening a dummy one." << endl; TQBuffer *buffer = new TQBuffer(); - buffer->setBuffer(TQByteArray()); + buffer->tqsetBufferFromCopy(TQByteArray()); buffer->open(IO_ReadWrite); m_str = new TQDataStream( buffer); (*m_str) << (TQ_INT32) KSYCOCA_VERSION; @@ -230,7 +230,7 @@ void KSycoca::closeDatabase() { QIODevice *device = 0; if (m_str) - device = m_str->device(); + device = m_str->tqdevice(); #ifdef HAVE_MMAP if (device && m_sycoca_mmap) { @@ -288,7 +288,7 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type) if ( !m_str ) openDatabase(); //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl; - m_str->device()->at(offset); + m_str->tqdevice()->tqat(offset); TQ_INT32 aType; (*m_str) >> aType; type = (KSycocaType) aType; @@ -306,7 +306,7 @@ bool KSycoca::checkVersion(bool abortOnError) // We should never get here... if a database was found then m_str shouldn't be 0L. assert(m_str); } - m_str->device()->at(0); + m_str->tqdevice()->tqat(0); TQ_INT32 aVersion; (*m_str) >> aVersion; if ( aVersion < KSYCOCA_VERSION ) @@ -361,7 +361,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) if (aId == id) { //kdDebug(7011) << TQString("KSycoca::findFactory(%1) offset %2").arg((int)id).arg(aOffset) << endl; - m_str->device()->at(aOffset); + m_str->tqdevice()->tqat(aOffset); return m_str; } } @@ -483,7 +483,7 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str ) else if ( bytes > 0 ) { // not empty int bt = bytes/2; str.setLength( bt ); - TQChar* ch = (TQChar *) str.unicode(); + TQChar* ch = (TQChar *) str.tqunicode(); char t[8192]; char *b = t; s.readRawBytes( b, bytes ); diff --git a/tdecore/ksycocadict.cpp b/tdecore/ksycocadict.cpp index d1deb609b..11b16b08b 100644 --- a/tdecore/ksycocadict.cpp +++ b/tdecore/ksycocadict.cpp @@ -29,7 +29,7 @@ namespace { struct string_entry { string_entry(TQString _key, KSycocaEntry *_payload) - { keyStr = _key; key = keyStr.unicode(); length = keyStr.length(); payload = _payload; hash = 0; } + { keyStr = _key; key = keyStr.tqunicode(); length = keyStr.length(); payload = _payload; hash = 0; } uint hash; int length; const TQChar *key; @@ -60,7 +60,7 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) : d(0), mStr(str), mOffset(offset) { TQ_UINT32 test1, test2; - str->device()->at(offset); + str->tqdevice()->tqat(offset); (*str) >> test1 >> test2; if ((test1 > 0x000fffff) || (test2 > 1024)) { @@ -70,10 +70,10 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) return; } - str->device()->at(offset); + str->tqdevice()->tqat(offset); (*str) >> mHashTableSize; (*str) >> mHashList; - mOffset = str->device()->at(); // Start of hashtable + mOffset = str->tqdevice()->tqat(); // Start of hashtable } KSycocaDict::~KSycocaDict() @@ -131,7 +131,7 @@ KSycocaDict::find_string(const TQString &key ) uint off = mOffset+sizeof(TQ_INT32)*hash; //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl; - mStr->device()->at( off ); + mStr->tqdevice()->tqat( off ); TQ_INT32 offset; (*mStr) >> offset; @@ -146,7 +146,7 @@ KSycocaDict::find_string(const TQString &key ) // Lookup duplicate list. offset = -offset; - mStr->device()->at(offset); + mStr->tqdevice()->tqat(offset); //kdDebug(7011) << TQString("Looking up duplicate list at %1").arg(offset,8,16) << endl; while(true) @@ -286,7 +286,7 @@ KSycocaDict::save(TQDataStream &str) return; } - mOffset = str.device()->at(); + mOffset = str.tqdevice()->tqat(); //kdDebug(7011) << TQString("KSycocaDict: %1 entries.").arg(count()) << endl; @@ -402,12 +402,12 @@ KSycocaDict::save(TQDataStream &str) str << mHashTableSize; str << mHashList; - mOffset = str.device()->at(); // mOffset points to start of hashTable + mOffset = str.tqdevice()->tqat(); // mOffset points to start of hashTable //kdDebug(7011) << TQString("Start of Hash Table, offset = %1").arg(mOffset,8,16) << endl; for(int pass = 1; pass <= 2; pass++) { - str.device()->at(mOffset); + str.tqdevice()->tqat(mOffset); //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) { @@ -421,7 +421,7 @@ KSycocaDict::save(TQDataStream &str) str << tmpid; //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl; } - //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.device()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; //kdDebug(7011) << TQString("Writing duplicate lists (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) @@ -429,7 +429,7 @@ KSycocaDict::save(TQDataStream &str) if (hashTable[i].duplicates) { TQPtrList<string_entry> *dups = hashTable[i].duplicates; - hashTable[i].duplicate_offset = str.device()->at(); + hashTable[i].duplicate_offset = str.tqdevice()->tqat(); /*kdDebug(7011) << TQString("Duplicate lists: Offset = %1 list_size = %2") .arg(hashTable[i].duplicate_offset,8,16).arg(dups->count()) << endl; */ @@ -441,7 +441,7 @@ KSycocaDict::save(TQDataStream &str) str << (TQ_INT32) 0; // End of list marker (0) } } - //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; } //kdDebug(7011) << "Cleaning up hash table." << endl; diff --git a/tdecore/ksycocaentry.h b/tdecore/ksycocaentry.h index a3071ec5a..a3cb9595f 100644 --- a/tdecore/ksycocaentry.h +++ b/tdecore/ksycocaentry.h @@ -101,7 +101,7 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them */ virtual void save(TQDataStream &s) { - mOffset = s.device()->at(); // store position in member variable + mOffset = s.tqdevice()->tqat(); // store position in member variable s << (TQ_INT32) sycocaType() << mPath; } diff --git a/tdecore/ksycocafactory.cpp b/tdecore/ksycocafactory.cpp index c224ebe79..da65619e6 100644 --- a/tdecore/ksycocafactory.cpp +++ b/tdecore/ksycocafactory.cpp @@ -46,10 +46,10 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) (*m_str) >> i; m_endEntryOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->tqat(); // Init index tables m_sycocaDict = new KSycocaDict(m_str, m_sycocaDictOffset); - saveOffset = m_str->device()->at(saveOffset); + saveOffset = m_str->tqdevice()->tqat(saveOffset); } } else @@ -78,7 +78,7 @@ void KSycocaFactory::saveHeader(TQDataStream &str) { // Write header - str.device()->at(mOffset); + str.tqdevice()->tqat(mOffset); str << (TQ_INT32) m_sycocaDictOffset; str << (TQ_INT32) m_beginEntryOffset; str << (TQ_INT32) m_endEntryOffset; @@ -91,13 +91,13 @@ KSycocaFactory::save(TQDataStream &str) // building database if (!m_sycocaDict) return; // Error! - mOffset = str.device()->at(); // store position in member variable + mOffset = str.tqdevice()->tqat(); // store position in member variable m_sycocaDictOffset = 0; // Write header (pass #1) saveHeader(str); - m_beginEntryOffset = str.device()->at(); + m_beginEntryOffset = str.tqdevice()->tqat(); // Write all entries. int entryCount = 0; @@ -110,7 +110,7 @@ KSycocaFactory::save(TQDataStream &str) entryCount++; } - m_endEntryOffset = str.device()->at(); + m_endEntryOffset = str.tqdevice()->tqat(); // Write indices... // Linear index @@ -124,16 +124,16 @@ KSycocaFactory::save(TQDataStream &str) } // Dictionary index - m_sycocaDictOffset = str.device()->at(); + m_sycocaDictOffset = str.tqdevice()->tqat(); m_sycocaDict->save(str); - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->tqat(); // Update header (pass #2) saveHeader(str); // Seek to end. - str.device()->at(endOfFactoryData); + str.tqdevice()->tqat(endOfFactoryData); } void @@ -169,7 +169,7 @@ KSycocaEntry::List KSycocaFactory::allEntries() // Assume we're NOT building a database - m_str->device()->at(m_endEntryOffset); + m_str->tqdevice()->tqat(m_endEntryOffset); TQ_INT32 entryCount; (*m_str) >> entryCount; diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp index 3152ce9b9..f439b55ef 100644 --- a/tdecore/ktempfile.cpp +++ b/tdecore/ktempfile.cpp @@ -46,7 +46,7 @@ #include <tqdatetime.h> #include <tqfile.h> #include <tqdatastream.h> -#include <textstream.h> +#include <tqtextstream.h> #include "kglobal.h" #include "kapplication.h" diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index bc9b4b348..dbd589d85 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <cerrno> #include <climits> @@ -285,12 +285,12 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const char *originalZone = ::getenv("TZ"); // Get the time in the current timezone. - TQDateTime basisTime = TQDateTime::currentDateTime(basisSpec); + TQDateTime basisTime = TQDateTime::tqcurrentDateTime(basisSpec); // Set the timezone and find out what time it is there compared to the basis. ::setenv("TZ", m_name.utf8(), 1); tzset(); - TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); + TQDateTime remoteTime = TQDateTime::tqcurrentDateTime(Qt::LocalTime); int offset = remoteTime.secsTo(basisTime); // Now restore things diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index ecaa58397..f6c3fd19b 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -42,9 +42,9 @@ #include <tqdir.h> #include <tqstringlist.h> #include <tqregexp.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqmap.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqmutex.h> #ifdef Q_WS_WIN @@ -172,14 +172,14 @@ static TQString lazy_encode( const TQString& segment, bool encodeAt=true ) for ( int i = 0; i < old_length; i++ ) { - unsigned int character = segment[i].unicode(); // Don't use latin1() + unsigned int character = segment[i].tqunicode(); // Don't use latin1() // It returns 0 for non-latin1 values // Small set of really ambiguous chars if ((character < 32) || // Low ASCII ((character == '%') && // The escape character itself (i+2 < old_length) && // But only if part of a valid escape sequence! - (hex2int(segment[i+1].unicode())!= -1) && - (hex2int(segment[i+2].unicode())!= -1)) || + (hex2int(segment[i+1].tqunicode())!= -1) && + (hex2int(segment[i+2].tqunicode())!= -1)) || (character == '?') || // Start of query delimiter ((character == '@') && encodeAt) || // Username delimiter (character == '#') || // Start of reference delimiter @@ -404,7 +404,7 @@ bool KURL::isRelativeURL(const TQString &_url) { int len = _url.length(); if (!len) return true; // Very short relative URL. - const TQChar *str = _url.unicode(); + const TQChar *str = _url.tqunicode(); // Absolute URL must start with alpha-character if (!isalpha(str[0].latin1())) @@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint ) KURL::KURL( const char * url, int encoding_hint ) { reset(); - parse( TQString::fromLatin1(url), encoding_hint ); + parse( TQString::tqfromLatin1(url), encoding_hint ); } KURL::KURL( const TQCString& url, int encoding_hint ) { reset(); - parse( TQString::fromLatin1(url), encoding_hint ); + parse( TQString::tqfromLatin1(url), encoding_hint ); } KURL::KURL( const KURL& _u ) @@ -643,7 +643,7 @@ void KURL::parse( const TQString& _url, int encoding_hint ) return; } - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); const TQChar* orig = buf; uint len = _url.length(); uint pos = 0; @@ -707,7 +707,7 @@ NodeErr: void KURL::parseRawURI( const TQString& _url, int encoding_hint ) { uint len = _url.length(); - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); uint pos = 0; @@ -762,7 +762,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint ) bool badHostName = false; int start = 0; uint len = _url.length(); - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); TQChar delim; TQString tmp; @@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url ) KURL& KURL::operator=( const char * _url ) { reset(); - parse( TQString::fromLatin1(_url) ); + parse( TQString::tqfromLatin1(_url) ); return *this; } @@ -2150,7 +2150,7 @@ TQMap< TQString, TQString > KURL::queryItems( int options, int encoding_hint ) c name = name.lower(); TQString value = (*it).mid( equal_pos + 1 ); if ( value.isEmpty() ) - result.insert( name, TQString::fromLatin1("") ); + result.insert( name, TQString::tqfromLatin1("") ); else { // ### why is decoding name not necessary? value.replace( '+', ' ' ); // + in queries means space @@ -2191,7 +2191,7 @@ TQString KURL::queryItem( const TQString& _item, int encoding_hint ) const return decode_string( str, encoding_hint ); } else // empty value - return TQString::fromLatin1(""); + return TQString::tqfromLatin1(""); } } diff --git a/tdecore/kurl.h b/tdecore/kurl.h index ef454f60f..9cfac2885 100644 --- a/tdecore/kurl.h +++ b/tdecore/kurl.h @@ -281,7 +281,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::fromLatin1() + * @see TQString::tqfromLatin1() */ KURL( const char * url, int encoding_hint = 0 ); /** @@ -307,7 +307,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::fromLatin1() + * @see TQString::tqfromLatin1() */ KURL( const TQCString& url, int encoding_hint = 0 ); @@ -1586,7 +1586,7 @@ public: * * Convenience function. * - * Convert unicoded string to local encoding and use %%-style + * Convert tqunicoded string to local encoding and use %%-style * encoding for all common delimiters / non-ascii characters. * * @param str the string to encode (can be @c TQString::null) @@ -1605,7 +1605,7 @@ public: * * Convenience function. * - * Convert unicoded string to local encoding and use %%-style + * Convert tqunicoded string to local encoding and use %%-style * encoding for all common delimiters and non-ascii characters * as well as the slash @c '/'. * @@ -1623,7 +1623,7 @@ public: * * Convenience function. * - * Decode %-style encoding and convert from local encoding to unicode. + * Decode %-style encoding and convert from local encoding to tqunicode. * * Reverse of encode_string() * diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h index 45a0e5945..aee9d83b9 100644 --- a/tdecore/kurldrag.h +++ b/tdecore/kurldrag.h @@ -30,7 +30,7 @@ class KURLDragPrivate; /** * This class is to be used instead of TQUriDrag when using KURL. * The reason is: TQUriDrag (and the XDND/W3C standards) expect URLs to - * be encoded in UTF-8 (unicode), but KURL uses the current locale + * be encoded in UTF-8 (tqunicode), but KURL uses the current locale * by default. * The other reasons for using this class are: * @li it exports text/plain (for dropping/pasting into lineedits, mails etc.) diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c index dba0fdef0..c25800f5d 100644 --- a/tdecore/malloc/malloc.c +++ b/tdecore/malloc/malloc.c @@ -85,7 +85,7 @@ int kde_malloc_is_used = 0; calloc(size_t n_elements, size_t element_size); free(Void_t* p); realloc(Void_t* p, size_t n); - memalign(size_t alignment, size_t n); + memalign(size_t tqalignment, size_t n); valloc(size_t n); mallinfo() mallopt(int parameter_number, int parameter_value) @@ -107,7 +107,7 @@ int kde_malloc_is_used = 0; You can adjust this by defining INTERNAL_SIZE_T Alignment: 2 * sizeof(size_t) (default) - (i.e., 8 byte alignment with 4byte size_t). This suffices for + (i.e., 8 byte tqalignment with 4byte size_t). This suffices for nearly all current machines and C compilers. However, you can define MALLOC_ALIGNMENT to be wider than this if necessary. @@ -146,7 +146,7 @@ int kde_malloc_is_used = 0; default used to obtain memory from system) accepts signed arguments, and may not be able to handle size_t-wide arguments with negative sign bit. Generally, values that would - appear as negative after accounting for overhead and alignment + appear as negative after accounting for overhead and tqalignment are supported only via mmap(), which does not have this limitation. @@ -394,7 +394,7 @@ extern "C" { expense of not being able to handle more than 2^32 of malloced space. If this limitation is acceptable, you are encouraged to set this unless you are on a platform requiring 16byte alignments. In - this case the alignment requirements turn out to negate any + this case the tqalignment requirements turn out to negate any potential advantages of decreasing size_t word size. Implementors: Beware of the possible combinations of: @@ -419,11 +419,11 @@ extern "C" { /* - MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. + MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks. It must be a power of two at least 2 * SIZE_SZ, even on machines for which smaller alignments would suffice. It may be defined as larger than this though. Note however that code and data structures - are optimized for the case of 8-byte alignment. + are optimized for the case of 8-byte tqalignment. */ @@ -957,13 +957,13 @@ Void_t* public_rEALLOc(); #endif /* - memalign(size_t alignment, size_t n); + memalign(size_t tqalignment, size_t n); Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. + in accord with the tqalignment argument. - The alignment argument should be a power of two. If the argument is + The tqalignment argument should be a power of two. If the argument is not a power of two, the nearest greater power is used. - 8-byte alignment is guaranteed by normal malloc calls, so don't + 8-byte tqalignment is guaranteed by normal malloc calls, so don't bother calling memalign with an argument of 8 or less. Overreliance on memalign is a sure way to fragment space. @@ -1228,7 +1228,7 @@ int public_mTRIm(); Returns the number of bytes you can actually use in an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. + often not) due to tqalignment and minimum size constraints. You can use this many bytes without worrying about overwriting other allocated objects. This is not a particularly great programming practice. malloc_usable_size can be more useful in @@ -1252,8 +1252,8 @@ size_t public_mUSABLe(); number of bytes allocated via malloc (or realloc, etc) but not yet freed. Note that this is the number of bytes allocated, not the number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than + because of tqalignment and bookkeeping overhead. Because it includes + tqalignment wastage as being in use, this figure may be greater than zero even when no user-level chunks are allocated. The reported current and maximum system memory can be inaccurate if @@ -1290,7 +1290,7 @@ void public_mSTATs(); fragmentation without improving speed. M_MXFAST is set in REQUEST size units. It is internally used in - chunksize units, which adds padding and alignment. You can reduce + chunksize units, which adds padding and tqalignment. You can reduce M_MXFAST to 0 to disable all use of fastbins. This causes the malloc algorithm to be a closer approximation of fifo-best-fit in all cases, not just for larger requests, but will generally cause it to be @@ -1434,7 +1434,7 @@ void public_mSTATs(); 1. The space cannot be reclaimed, consolidated, and then used to service later requests, as happens with normal chunks. - 2. It can lead to more wastage because of mmap page alignment + 2. It can lead to more wastage because of mmap page tqalignment requirements 3. It causes malloc performance to be more dependent on host system memory management support routines which may vary in @@ -1614,12 +1614,12 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { return m; } -Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { Void_t* m; if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(alignment, bytes); + m = mEMALIGn(tqalignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; @@ -1956,7 +1956,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ /* - ---------- Size and alignment checks and conversions ---------- + ---------- Size and tqalignment checks and conversions ---------- */ /* conversion from malloc headers to user pointers, and back */ @@ -1972,7 +1972,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ #define MINSIZE \ (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)) -/* Check if m has acceptable alignment */ +/* Check if m has acceptable tqalignment */ #define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) @@ -2641,7 +2641,7 @@ static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s; /* Legal size ... */ assert((sz & MALLOC_ALIGN_MASK) == 0); assert((unsigned long)(sz) >= MINSIZE); - /* ... and alignment */ + /* ... and tqalignment */ assert(aligned_OK(chunk2mem(p))); /* chunk is less than MINSIZE more than request */ assert((long)(sz) - (long)(s) >= 0); @@ -2704,7 +2704,7 @@ static void do_check_malloc_state() /* internal size_t must be no wider than pointer type */ assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*)); - /* alignment is a power of 2 */ + /* tqalignment is a power of 2 */ assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0); /* cannot run remaining checks until fully initialized */ @@ -3209,7 +3209,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* The offset to the start of the mmapped region is stored in the prev_size field of the chunk. This allows us to adjust - returned start address to meet alignment requirements here + returned start address to meet tqalignment requirements here and in memalign(), and still be able to compute proper address argument for later munmap in free() and realloc(). */ @@ -3288,7 +3288,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; Round to a multiple of page size. If MORECORE is not contiguous, this ensures that we only call it with whole-page arguments. And if MORECORE is contiguous and - this is not first time through, this preserves page-alignment of + this is not first time through, this preserves page-tqalignment of previous calls. Otherwise, we correct to page-align below. */ @@ -3384,7 +3384,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* handle contiguous cases */ if (contiguous(av)) { - /* Guarantee alignment of first new chunk made from this space */ + /* Guarantee tqalignment of first new chunk made from this space */ front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK; if (front_misalign > 0) { @@ -3554,7 +3554,7 @@ Void_t* mALLOc(size_t bytes) /* Convert request size to internal form by adding SIZE_SZ bytes - overhead plus possibly more to obtain necessary alignment and/or + overhead plus possibly more to obtain necessary tqalignment and/or to obtain a size of at least MINSIZE, the smallest allocatable size. Also, checked_request2size traps (returning 0) request sizes that are so large that they wrap around zero when padded and @@ -4127,54 +4127,54 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; INLINE #if __STD_C -Void_t* mEMALIGn(size_t alignment, size_t bytes) +Void_t* mEMALIGn(size_t tqalignment, size_t bytes) #else -Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; +Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes; #endif { INTERNAL_SIZE_T nb; /* padded request size */ char* m; /* memory returned by malloc call */ mchunkptr p; /* corresponding chunk */ - char* brk; /* alignment point within p */ + char* brk; /* tqalignment point within p */ mchunkptr newp; /* chunk to return */ INTERNAL_SIZE_T newsize; /* its size */ - INTERNAL_SIZE_T leadsize; /* leading space before alignment point */ + INTERNAL_SIZE_T leadsize; /* leading space before tqalignment point */ mchunkptr remainder; /* spare room at end to split off */ unsigned long remainder_size; /* its size */ INTERNAL_SIZE_T size; - /* If need less alignment than we give anyway, just relay to malloc */ + /* If need less tqalignment than we give anyway, just relay to malloc */ - if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); + if (tqalignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); /* Otherwise, ensure that it is at least a minimum chunk size */ - if (alignment < MINSIZE) alignment = MINSIZE; + if (tqalignment < MINSIZE) tqalignment = MINSIZE; - /* Make sure alignment is power of 2 (in case MINSIZE is not). */ - if ((alignment & (alignment - 1)) != 0) { + /* Make sure tqalignment is power of 2 (in case MINSIZE is not). */ + if ((tqalignment & (tqalignment - 1)) != 0) { size_t a = MALLOC_ALIGNMENT * 2; - while ((unsigned long)a < (unsigned long)alignment) a <<= 1; - alignment = a; + while ((unsigned long)a < (unsigned long)tqalignment) a <<= 1; + tqalignment = a; } checked_request2size(bytes, nb); /* - Strategy: find a spot within that chunk that meets the alignment + Strategy: find a spot within that chunk that meets the tqalignment request, and then possibly free the leading and trailing space. */ - /* Call malloc with worst case padding to hit alignment. */ + /* Call malloc with worst case padding to hit tqalignment. */ - m = (char*)(mALLOc(nb + alignment + MINSIZE)); + m = (char*)(mALLOc(nb + tqalignment + MINSIZE)); if (m == 0) return 0; /* propagate failure */ p = mem2chunk(m); - if ((((unsigned long)(m)) % alignment) != 0) { /* misaligned */ + if ((((unsigned long)(m)) % tqalignment) != 0) { /* misaligned */ /* Find an aligned spot inside chunk. Since we need to give back @@ -4184,10 +4184,10 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; total room so that this is always possible. */ - brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) & - -((signed long) alignment)); + brk = (char*)mem2chunk(((unsigned long)(m + tqalignment - 1)) & + -((signed long) tqalignment)); if ((unsigned long)(brk - (char*)(p)) < MINSIZE) - brk += alignment; + brk += tqalignment; newp = (mchunkptr)brk; leadsize = brk - (char*)(p); @@ -4208,7 +4208,7 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; p = newp; assert (newsize >= nb && - (((unsigned long)(chunk2mem(p))) % alignment) == 0); + (((unsigned long)(chunk2mem(p))) % tqalignment) == 0); } /* Also give back spare room at the end */ @@ -4375,7 +4375,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_ contents_size += request2size(sizes[i]); } - /* subtract out alignment bytes from total to minimize overallocation */ + /* subtract out tqalignment bytes from total to minimize overallocation */ size = contents_size + array_size - MALLOC_ALIGN_MASK; /* @@ -5356,7 +5356,7 @@ History: and Anonymous. * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for helping test this.) - * memalign: check alignment arg + * memalign: check tqalignment arg * realloc: don't try to shift chunks backwards, since this leads to more fragmentation in some programs and doesn't seem to help in any others. @@ -5409,7 +5409,7 @@ History: * Support another case of realloc via move into top * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to - avoid surprises about sbrk alignment conventions. + avoid surprises about sbrk tqalignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen (raymond@es.ele.tue.nl) for the suggestion. * Add `pad' argument to malloc_trim and top_pad mallopt parameter. @@ -5569,7 +5569,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { #endif } -Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { #ifndef KDE_MALLOC_FULL if( malloc_type == 1 ) { @@ -5578,16 +5578,16 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(alignment, bytes); + m = mEMALIGn(tqalignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; #ifndef KDE_MALLOC_FULL } if( malloc_type == 2 ) - return libc_memalign( alignment, bytes ); + return libc_memalign( tqalignment, bytes ); init_malloc_type(); - return public_mEMALIGn( alignment, bytes ); + return public_mEMALIGn( tqalignment, bytes ); #endif } @@ -5728,7 +5728,7 @@ int public_mALLOPt(int p, int v) { #endif int -posix_memalign (void **memptr, size_t alignment, size_t size) +posix_memalign (void **memptr, size_t tqalignment, size_t size) { void *mem; @@ -5737,7 +5737,7 @@ posix_memalign (void **memptr, size_t alignment, size_t size) if (size % sizeof (void *) != 0 || (size & (size - 1)) != 0) return EINVAL; - mem = memalign (alignment, size); + mem = memalign (tqalignment, size); if (mem != NULL) { *memptr = mem; diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index f8f993a08..9785ce36c 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -148,7 +148,7 @@ bool KClientSocketBase::lookup() { if (d->localResolver.serviceName().isNull() && !d->localResolver.nodeName().isNull()) - d->localResolver.setServiceName(TQString::fromLatin1("")); + d->localResolver.setServiceName(TQString::tqfromLatin1("")); // don't restart the lookups if they had succeeded and // the input values weren't changed diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp index f61559bfb..648f4e571 100644 --- a/tdecore/network/khttpproxysocketdevice.cpp +++ b/tdecore/network/khttpproxysocketdevice.cpp @@ -153,7 +153,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi setState(0); // unset open flag // prepare the request - TQString request = TQString::fromLatin1("CONNECT %1:%2 HTTP/1.1\r\n" + TQString request = TQString::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n" "Cache-Control: no-cache\r\n" "Host: \r\n" "\r\n"); diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 672edb5af..93c029b8e 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -915,7 +915,7 @@ TQString KResolver::localHostName() } if (name.isEmpty()) - return TQString::fromLatin1("localhost"); + return TQString::tqfromLatin1("localhost"); if (name.find('.') == -1) { @@ -924,7 +924,7 @@ TQString KResolver::localHostName() KResolverResults results = resolve(name, "0", CanonName); if (results.isEmpty()) // cannot find a valid hostname! - return TQString::fromLatin1("localhost"); + return TQString::tqfromLatin1("localhost"); else return results.first().canonicalName(); } @@ -934,7 +934,7 @@ TQString KResolver::localHostName() // forward declaration -static TQStringList splitLabels(const TQString& unicodeDomain); +static TQStringList splitLabels(const TQString& tqunicodeDomain); static TQCString ToASCII(const TQString& label); static TQString ToUnicode(const TQString& label); @@ -943,11 +943,11 @@ static TQStringList *KResolver_initIdnDomains() const char *kde_use_idn = getenv("KDE_USE_IDN"); if (!kde_use_idn) kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn"; - return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower())); + return new TQStringList(TQStringList::split(':', TQString::tqfromLatin1(kde_use_idn).lower())); } // implement the ToAscii function, as described by IDN documents -TQCString KResolver::domainToAscii(const TQString& unicodeDomain) +TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain) { if (!idnDomains) idnDomains = KResolver_initIdnDomains(); @@ -958,7 +958,7 @@ TQCString KResolver::domainToAscii(const TQString& unicodeDomain) // 2) split the domain into individual labels, without // separators. - TQStringList input = splitLabels(unicodeDomain); + TQStringList input = splitLabels(tqunicodeDomain); // Do we allow IDN names for this TLD? if (input.count() && !idnDomains->contains(input[input.count()-1].lower())) @@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& unicodeDomain) TQString KResolver::domainToUnicode(const TQCString& asciiDomain) { - return domainToUnicode(TQString::fromLatin1(asciiDomain)); + return domainToUnicode(TQString::tqfromLatin1(asciiDomain)); } // implement the ToUnicode function, as described by IDN documents @@ -1048,7 +1048,7 @@ void KResolver::virtual_hook( int, void* ) // RFC 3492 - Punycode: A Bootstring encoding of Unicode // for Internationalized Domain Names in Applications (IDNA) -static TQStringList splitLabels(const TQString& unicodeDomain) +static TQStringList splitLabels(const TQString& tqunicodeDomain) { // From RFC 3490 section 3.1: // "Whenever dots are used as label separators, the following characters @@ -1060,9 +1060,9 @@ static TQStringList splitLabels(const TQString& unicodeDomain) TQStringList lst; int start = 0; uint i; - for (i = 0; i < unicodeDomain.length(); i++) + for (i = 0; i < tqunicodeDomain.length(); i++) { - unsigned int c = unicodeDomain[i].unicode(); + unsigned int c = tqunicodeDomain[i].tqunicode(); if (c == separators[0] || c == separators[1] || @@ -1070,13 +1070,13 @@ static TQStringList splitLabels(const TQString& unicodeDomain) c == separators[3]) { // found a separator! - lst << unicodeDomain.mid(start, i - start); + lst << tqunicodeDomain.mid(start, i - start); start = i + 1; } } if ((long)i >= start) // there is still one left - lst << unicodeDomain.mid(start, i - start); + lst << tqunicodeDomain.mid(start, i - start); return lst; } @@ -1101,7 +1101,7 @@ static TQCString ToASCII(const TQString& label) uint i; for (i = 0; i < label.length(); i++) - ucs4[i] = (unsigned long)label[i].unicode(); + ucs4[i] = (unsigned long)label[i].tqunicode(); ucs4[i] = 0; // terminate with NUL, just to be on the safe side if (idna_to_ascii_4i(ucs4, label.length(), buf, 0) == IDNA_SUCCESS) @@ -1118,7 +1118,7 @@ static TQCString ToASCII(const TQString& label) static TQString ToUnicode(const TQString& label) { #ifdef HAVE_IDNA_H - // We have idna.h, so we can use the idna_to_unicode + // We have idna.h, so we can use the idna_to_tqunicode // function :) TQ_UINT32 *ucs4_input, *ucs4_output; @@ -1126,7 +1126,7 @@ static TQString ToUnicode(const TQString& label) ucs4_input = new TQ_UINT32[label.length() + 1]; for (uint i = 0; i < label.length(); i++) - ucs4_input[i] = (unsigned long)label[i].unicode(); + ucs4_input[i] = (unsigned long)label[i].tqunicode(); // try the same length for output ucs4_output = new TQ_UINT32[outlen = label.length()]; diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index e2e08623b..1b13d676b 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -796,11 +796,11 @@ public: * Note that the encoding is illegible and, thus, should not be presented * to the user, except if requested. * - * @param unicodeDomain the domain name to be encoded + * @param tqunicodeDomain the domain name to be encoded * @return the ACE-encoded suitable for DNS queries if successful, a null * TQCString if failure. */ - static TQCString domainToAscii(const TQString& unicodeDomain); + static TQCString domainToAscii(const TQString& tqunicodeDomain); /** * Does the inverse of @ref domainToAscii and return an Unicode domain diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index a6f4e4ec0..6236cc15d 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -140,7 +140,7 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host) return false; // KDE4: QLatin1String - TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host)); + TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host)); TQMutexLocker locker(&blacklistMutex); @@ -251,7 +251,7 @@ namespace // check blacklist if (m_af != AF_INET && - KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname))) + KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname))) break; # ifdef USE_GETHOSTBYNAME2_R @@ -358,7 +358,7 @@ namespace if (socktype == 0) socktype = SOCK_STREAM; // default - TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name)); + TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name)); KInetSocketAddress sa; sa.setPort(m_port); if (he->h_addrtype != AF_INET) @@ -404,7 +404,7 @@ namespace { // check blacklist if ((m_af != AF_INET && m_af != AF_UNSPEC) && - KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node))) + KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node))) { results.setError(KResolver::NoName); finished(); @@ -550,8 +550,8 @@ bool KStandardWorker::sanityCheck() if (node.find('%') != -1) node.truncate(node.find('%')); - if (node.isEmpty() || node == TQString::fromLatin1("*") || - node == TQString::fromLatin1("localhost")) + if (node.isEmpty() || node == TQString::tqfromLatin1("*") || + node == TQString::tqfromLatin1("localhost")) m_encodedName.truncate(0); else { @@ -616,7 +616,7 @@ bool KStandardWorker::resolveService() // service name does not contain a port number // must be a name - if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0) + if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0) port = 0; else { @@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically() // now try to resolve the hostname numerically KInetSocketAddress sa; setError(KResolver::NoError); - sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName))); + sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName))); // if it failed, the length was reset to 0 bool ok = sa.length() != 0; diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp index 5c602458c..00ef7f81d 100644 --- a/tdecore/network/kreverseresolver.cpp +++ b/tdecore/network/kreverseresolver.cpp @@ -238,8 +238,8 @@ bool ReverseThread::run() if (err == 0) { - node = KResolver::domainToUnicode(TQString::fromLatin1(h)); - service = TQString::fromLatin1(s); + node = KResolver::domainToUnicode(TQString::tqfromLatin1(h)); + service = TQString::tqfromLatin1(s); success = true; } else diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index 49facb12c..bd63d6306 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -155,7 +155,7 @@ bool KServerSocket::lookup() // make sure we have at least one parameter for lookup if (d->resolver.serviceName().isNull() && !d->resolver.nodeName().isNull()) - d->resolver.setServiceName(TQString::fromLatin1("")); + d->resolver.setServiceName(TQString::tqfromLatin1("")); // don't restart the lookups if they had succeeded and // the input values weren't changed diff --git a/tdecore/network/ksocketaddress.cpp b/tdecore/network/ksocketaddress.cpp index 7ceeba99d..feaabfab5 100644 --- a/tdecore/network/ksocketaddress.cpp +++ b/tdecore/network/ksocketaddress.cpp @@ -165,7 +165,7 @@ bool KIpAddress::setAddress(const TQString& address) bool KIpAddress::setAddress(const char* address) { - return setAddress(TQString::fromLatin1(address)); + return setAddress(TQString::tqfromLatin1(address)); } // set from binary data @@ -194,13 +194,13 @@ TQString KIpAddress::toString() const { case 4: inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1); - return TQString::fromLatin1(buf); + return TQString::tqfromLatin1(buf); case 6: #ifdef AF_INET6 inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1); #endif - return TQString::fromLatin1(buf); + return TQString::tqfromLatin1(buf); } return TQString::null; @@ -270,7 +270,7 @@ public: { addr.generic = 0L; curlen = 0; - invalidate(); + tqinvalidate(); } ~KSocketAddressData() @@ -282,7 +282,7 @@ public: inline bool invalid() const { return reallen == 0; } - inline void invalidate() + inline void tqinvalidate() { reallen = 0; } void dup(const sockaddr* sa, TQ_UINT16 len, bool clear = true); @@ -348,7 +348,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) if (len < MIN_SOCKADDR_LEN) { // certainly invalid - invalidate(); + tqinvalidate(); return; } @@ -359,7 +359,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) (sa->sa_family == AF_UNIX && len < MIN_SOCKADDR_UN_LEN))) { // also invalid - invalidate(); + tqinvalidate(); return; } @@ -444,7 +444,7 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other) if (other.d && !other.d->invalid()) d->dup(other.d->addr.generic, other.d->reallen); else - d->invalidate(); + d->tqinvalidate(); return *this; } @@ -467,7 +467,7 @@ KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) if (sa != 0L && len >= MIN_SOCKADDR_LEN) d->dup(sa, len); else - d->invalidate(); + d->tqinvalidate(); return *this; } @@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const fmt = "[%1]:%2"; #endif else if (d->addr.generic->sa_family == AF_UNIX) - return TQString::fromLatin1("unix:%1").arg(serviceName()); + return TQString::tqfromLatin1("unix:%1").arg(serviceName()); else return i18n("1: the unknown socket address family number", "Unknown family %1").arg(d->addr.generic->sa_family); @@ -788,7 +788,7 @@ KInetSocketAddress& KInetSocketAddress::setHost(const KIpAddress& ip) default: // empty - d->invalidate(); + d->tqinvalidate(); } return *this; @@ -832,7 +832,7 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port) #endif default: - d->invalidate(); // setting the port on something else + d->tqinvalidate(); // setting the port on something else } return *this; @@ -897,7 +897,7 @@ void KInetSocketAddress::update() return; #endif else - d->invalidate(); + d->tqinvalidate(); } KUnixSocketAddress::KUnixSocketAddress() @@ -908,7 +908,7 @@ KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len) : KSocketAddress(sa, len) { if (!d->invalid() && d->addr.un->sun_family != AF_UNIX) - d->invalidate(); + d->tqinvalidate(); } KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other) diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h index a57d11e82..d02a6984c 100644 --- a/tdecore/network/ksocketaddress.h +++ b/tdecore/network/ksocketaddress.h @@ -511,7 +511,7 @@ public: * buffer to fit needs. This function should not be used except for handling * unknown socket address structures. * - * Also note that this function may invalidate the socket if a known + * Also note that this function may tqinvalidate the socket if a known * family is set (Internet or Unix socket) and the new length would be * too small to hold the system's sockaddr_* structure. If unsure, reset * the family: @@ -535,7 +535,7 @@ public: /** * Sets the family of this object. * - * Note: setting the family will probably invalidate any address data + * Note: setting the family will probably tqinvalidate any address data * contained in this object. Use this function with care. * * @param family the new family to set diff --git a/tdecore/network/ksocketbase.cpp b/tdecore/network/ksocketbase.cpp index 8449dbdc8..f5410f3e8 100644 --- a/tdecore/network/ksocketbase.cpp +++ b/tdecore/network/ksocketbase.cpp @@ -309,7 +309,7 @@ int KActiveSocketBase::putch(int ch) void KActiveSocketBase::setError(int status, SocketError error) { KSocketBase::setError(error); - seStatus(status); + setqStatus(status); } void KActiveSocketBase::resetError() diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index f3166b982..2ec5bb4bf 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -54,8 +54,8 @@ bool KSrvResolverWorker::preprocess() if (node.find('%') != -1) node.truncate(node.find('%')); - if (node.isEmpty() || node == TQString::fromLatin1("*") || - node == TQString::fromLatin1("localhost")) + if (node.isEmpty() || node == TQString::tqfromLatin1("*") || + node == TQString::tqfromLatin1("localhost")) return false; // empty == localhost encodedName = KResolver::domainToAscii(node); @@ -85,7 +85,7 @@ bool KSrvResolverWorker::preprocess() return false; protoname = "_"; - protoname += names.at(0); + protoname += names.tqat(0); } else if (sockettype == SOCK_STREAM || sockettype == 0) protoname = "_tcp"; @@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { - dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv); + dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv); TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady())); } diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index 42ca8557c..85830126b 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -201,7 +201,7 @@ public: // Combine new and old matrix TQWMatrix matrix = m_engine->painter()->parseTransform(transform); - TQWMatrix *current = m_engine->painter()->worldMatrix(); + TQWMatrix *current = m_engine->painter()->tqworldMatrix(); #ifdef USE_QT4 printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r"); #else // USE_QT4 @@ -225,9 +225,9 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n TQPtrList<TQDomNamedNodeMap> applyList; applyList.setAutoDelete(true); - TQDomNode shape = node.parentNode(); - for(; !shape.isNull() ; shape = shape.parentNode()) - applyList.prepend(new TQDomNamedNodeMap(shape.attributes())); + TQDomNode tqshape = node.parentNode(); + for(; !tqshape.isNull() ; tqshape = tqshape.parentNode()) + applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes())); // Apply parent attributes for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next()) @@ -628,7 +628,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path) d->width = w; d->height = h; - d->painter->worldMatrix()->scale(vratiow, vratioh); + d->painter->tqworldMatrix()->scale(vratiow, vratioh); } else { @@ -637,10 +637,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path) double ratiow = width / d->width; double ratioh = height / d->height; - d->painter->worldMatrix()->scale(ratiow, ratioh); + d->painter->tqworldMatrix()->scale(ratiow, ratioh); } - TQWMatrix initialMatrix = *d->painter->worldMatrix(); + TQWMatrix initialMatrix = *d->painter->tqworldMatrix(); d->helper->m_initialMatrix = initialMatrix; // Apply transform diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp index dbd867f13..6c4c52c6a 100644 --- a/tdecore/svgicons/ksvgiconpainter.cpp +++ b/tdecore/svgicons/ksvgiconpainter.cpp @@ -65,7 +65,7 @@ public: m_useFillGradient = false; m_useStrokeGradient = false; - m_worldMatrix = new TQWMatrix(); + m_tqworldMatrix = new TQWMatrix(); // Create new image with alpha support m_image = new TQImage(width, height, 32); @@ -102,7 +102,7 @@ public: art_free(m_buffer); delete m_image; - delete m_worldMatrix; + delete m_tqworldMatrix; for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it) { @@ -233,12 +233,12 @@ public: void drawBPath(ArtBpath *bpath) { double affine[6]; - affine[0] = m_worldMatrix->m11(); - affine[1] = m_worldMatrix->m12(); - affine[2] = m_worldMatrix->m21(); - affine[3] = m_worldMatrix->m22(); - affine[4] = m_worldMatrix->dx(); - affine[5] = m_worldMatrix->dy(); + affine[0] = m_tqworldMatrix->m11(); + affine[1] = m_tqworldMatrix->m12(); + affine[2] = m_tqworldMatrix->m21(); + affine[3] = m_tqworldMatrix->m22(); + affine[4] = m_tqworldMatrix->dx(); + affine[5] = m_tqworldMatrix->dy(); ArtBpath *temp = art_bpath_affine_transform(bpath, affine); ArtVpath *vec = art_bez_path_to_vec(temp, 0.25); @@ -249,12 +249,12 @@ public: void drawVPath(ArtVpath *vec) { double affine[6]; - affine[0] = m_worldMatrix->m11(); - affine[1] = m_worldMatrix->m12(); - affine[2] = m_worldMatrix->m21(); - affine[3] = m_worldMatrix->m22(); - affine[4] = m_worldMatrix->dx(); - affine[5] = m_worldMatrix->dy(); + affine[0] = m_tqworldMatrix->m11(); + affine[1] = m_tqworldMatrix->m12(); + affine[2] = m_tqworldMatrix->m21(); + affine[3] = m_tqworldMatrix->m22(); + affine[4] = m_tqworldMatrix->dx(); + affine[5] = m_tqworldMatrix->dy(); ArtVpath *temp = art_vpath_affine_transform(vec, affine); art_free(vec); @@ -461,10 +461,10 @@ public: m.map(x1, y1, &x1, &y1); m.map(x2, y2, &x2, &y2); - double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx(); - double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy(); - double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx(); - double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy(); + double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx(); + double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy(); + double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx(); + double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy(); double dx = x2n - x1n; double dy = y2n - y1n; @@ -515,12 +515,12 @@ public: else fy = cy; - radial->affine[0] = m_worldMatrix->m11(); - radial->affine[1] = m_worldMatrix->m12(); - radial->affine[2] = m_worldMatrix->m21(); - radial->affine[3] = m_worldMatrix->m22(); - radial->affine[4] = m_worldMatrix->dx(); - radial->affine[5] = m_worldMatrix->dy(); + radial->affine[0] = m_tqworldMatrix->m11(); + radial->affine[1] = m_tqworldMatrix->m12(); + radial->affine[2] = m_tqworldMatrix->m21(); + radial->affine[3] = m_tqworldMatrix->m22(); + radial->affine[4] = m_tqworldMatrix->dx(); + radial->affine[5] = m_tqworldMatrix->dy(); radial->fx = (fx - cx) / r; radial->fy = (fy - cy) / r; @@ -1123,7 +1123,7 @@ private: ArtSVP *m_clipSVP; TQImage *m_image; - TQWMatrix *m_worldMatrix; + TQWMatrix *m_tqworldMatrix; TQString m_fillRule; TQString m_joinStyle; @@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image() return new TQImage(*d->helper->m_image); } -TQWMatrix *KSVGIconPainter::worldMatrix() +TQWMatrix *KSVGIconPainter::tqworldMatrix() { - return d->helper->m_worldMatrix; + return d->helper->m_tqworldMatrix; } void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix) { - if(d->helper->m_worldMatrix) - delete d->helper->m_worldMatrix; + if(d->helper->m_tqworldMatrix) + delete d->helper->m_tqworldMatrix; - d->helper->m_worldMatrix = matrix; + d->helper->m_tqworldMatrix = matrix; } void KSVGIconPainter::setStrokeWidth(double width) @@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image) image = image.convertDepth(32); double affine[6]; - affine[0] = d->helper->m_worldMatrix->m11(); - affine[1] = d->helper->m_worldMatrix->m12(); - affine[2] = d->helper->m_worldMatrix->m21(); - affine[3] = d->helper->m_worldMatrix->m22(); + affine[0] = d->helper->m_tqworldMatrix->m11(); + affine[1] = d->helper->m_tqworldMatrix->m12(); + affine[2] = d->helper->m_tqworldMatrix->m21(); + affine[3] = d->helper->m_tqworldMatrix->m22(); // use the world matrix to convert the coordinates - d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]); + d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]); d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height, d->helper->m_rowstride, image.bits(), image.width(), image.height(), diff --git a/tdecore/svgicons/ksvgiconpainter.h b/tdecore/svgicons/ksvgiconpainter.h index de5644187..b80eccea8 100644 --- a/tdecore/svgicons/ksvgiconpainter.h +++ b/tdecore/svgicons/ksvgiconpainter.h @@ -41,7 +41,7 @@ public: TQImage *image(); - TQWMatrix *worldMatrix(); + TQWMatrix *tqworldMatrix(); void finish(); @@ -61,7 +61,7 @@ public: void setStrokeDashOffset(const TQString &dashOffset); void setStrokeDashArray(const TQString &dashes); - void setWorldMatrix(TQWMatrix *worldMatrix); + void setWorldMatrix(TQWMatrix *tqworldMatrix); void setClippingRect(int x, int y, int w, int h); void drawRectangle(double x, double y, double w, double h, double rx, double ry); diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp index 51a40b892..8b6e8eea4 100644 --- a/tdecore/tests/kcalendartest.cpp +++ b/tdecore/tests/kcalendartest.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) { option = args->getOption("date"); date = KGlobal::locale()->readDate(option); } else - date = TQDate::currentDate(); + date = TQDate::tqcurrentDate(); args->clear(); // Free up some memory. diff --git a/tdecore/tests/kconfigtestgui.h b/tdecore/tests/kconfigtestgui.h index ec9be5a46..7655c8142 100644 --- a/tdecore/tests/kconfigtestgui.h +++ b/tdecore/tests/kconfigtestgui.h @@ -25,7 +25,7 @@ #include <tqfileinfo.h> #include <kdebug.h> #include <ksimpleconfig.h> -#include <textstream.h> +#include <tqtextstream.h> // Standard Qt widgets diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index 7323df34c..29f6cd3e3 100644 --- a/tdecore/tests/klocaletest.cpp +++ b/tdecore/tests/klocaletest.cpp @@ -77,19 +77,19 @@ void Test::createFields() string+="Used language: "; string+=KGlobal::locale()->language()+"\n"; string+="Locale encoding: "; - string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); string+="\nLocalized monetary numbers: "; string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89); // This will not work // but you can copy other *.mo file string+="\nSome localized strings:\n"; - string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n"; - string+=TQString::fromLatin1("No = ")+i18n("No")+"\n"; - string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n"; - string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n"; + string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n"; + string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n"; + string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n"; + string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n"; label=new TQLabel(string,this,"Label"); label->setGeometry(10,10,400,400); @@ -102,9 +102,9 @@ int main( int argc, char ** argv ) KLocale::setMainCatalogue("tdelibs"); KApplication a( argc, argv, "klocaletest" ); - KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::fromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US")); + KGlobal::locale()->setCountry(TQString::tqfromLatin1("C")); + KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(",")); TQString formatted; formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); @@ -152,8 +152,8 @@ int main( int argc, char ** argv ) TQDate date; date.setYMD( 2002, 5, 3 ); checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); - date = TQDate::currentDate(); - checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + date = TQDate::tqcurrentDate(); + checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); TQTime time; time = KGlobal::locale()->readTime( "11:22:33", &ok ); @@ -181,11 +181,11 @@ int main( int argc, char ** argv ) check("formatTime(\"0:22\", as duration)", timeStr, "00:22" ); kdDebug() << "setLanguage C\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("de")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de")); kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp index f1d3c11f9..1b2f5148d 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -75,8 +75,8 @@ public: bool tryLookup(const char* node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error); @@ -138,8 +138,8 @@ bool try_pton() bool tryLookup6(const char *node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error); diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp index e335b17d9..368a1106f 100644 --- a/tdecore/tests/krfcdatetest.cpp +++ b/tdecore/tests/krfcdatetest.cpp @@ -4,7 +4,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kcharsets.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <krfcdate.h> bool check(TQString txt, time_t a, time_t b) diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp index 650cc0512..69ea7c8a1 100644 --- a/tdecore/tests/ktimezonestest.cpp +++ b/tdecore/tests/ktimezonestest.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) // Find the current offset of the UTC timezone. timezone = timezones.zone("UTC"); - printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) ); + printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) ); // Find some offsets for Europe/London. char *london = "Europe/London"; diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index e9fb33254..bcee63ac3 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kcharsets.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqdatastream.h> #include <assert.h> #include <kcmdlineargs.h> @@ -384,7 +384,7 @@ int main(int argc, char *argv[]) check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt"); // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238) TQString tmpurl = "file:/home/dfaure/myolddir/"; - if ( tmpurl.at(tmpurl.length() - 1) == '/') + if ( tmpurl.tqat(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first tmpurl.truncate( tmpurl.length() - 1); KURL newUrl = tmpurl; |