diff options
Diffstat (limited to 'tdecore')
87 files changed, 535 insertions, 535 deletions
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp index e6aa1a68a..3aa9aa062 100644 --- a/tdecore/kaboutdata.cpp +++ b/tdecore/kaboutdata.cpp @@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image) TQString KAboutData::version() const { - return TQString::tqfromLatin1(mVersion); + return TQString::fromLatin1(mVersion); } TQString @@ -311,13 +311,13 @@ KAboutData::shortDescription() const TQString KAboutData::homepage() const { - return TQString::tqfromLatin1(mHomepageAddress); + return TQString::fromLatin1(mHomepageAddress); } TQString KAboutData::bugAddress() const { - return TQString::tqfromLatin1(mBugEmailAddress); + return TQString::fromLatin1(mBugEmailAddress); } const TQValueList<KAboutPerson> diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 1abc8d381..660cc4c29 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->tqfocusWidget() ) + if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) return false; - if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) ) + if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent ) ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->tqfocusWidget(), &ke ); + kapp->sendEvent( kapp->focusWidget(), &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 6e8f08e0a..d9f0b5cda 100644 --- a/tdecore/kaccelmanager.cpp +++ b/tdecore/kaccelmanager.cpp @@ -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->tqmetaObject()->findProperty("text", true); + int tprop = it->m_widget->metaObject()->findProperty("text", true); if (tprop != -1) { if (checkChange(contents[cnt])) it->m_widget->setProperty("text", contents[cnt].accelerated()); } else { - tprop = it->m_widget->tqmetaObject()->findProperty("title", true); + tprop = it->m_widget->metaObject()->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->tqmetaObject()->findProperty("text", true); + int tprop = w->metaObject()->findProperty("text", true); if (tprop != -1) { - const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); + const TQMetaProperty* p = w->metaObject()->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->tqmetaObject()->findProperty("title", true); + tprop = w->metaObject()->findProperty("title", true); if (tprop != -1) { - const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); + const TQMetaProperty* p = w->metaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); } diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 878b6e12f..6e5ae5d40 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -1012,7 +1012,7 @@ void KApplication::init(bool GUIenabled) // install appdata resource type KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") - + TQString::tqfromLatin1(name()) + '/'); + + TQString::fromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1291,7 +1291,7 @@ void KApplication::commitData( TQSessionManager& sm ) if ( sm.allowsInteraction() ) { TQWidgetList done; - TQWidgetList *list = TQApplication::tqtopLevelWidgets(); + TQWidgetList *list = TQApplication::topLevelWidgets(); 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::tqtopLevelWidgets(); + list = TQApplication::topLevelWidgets(); 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::tqfromLatin1("tdeinit")); + TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::fromLatin1("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(tqfocusWidget()); + TQObject *object = TQT_TQOBJECT(focusWidget()); if( !object ) return; - TQMetaObject *meta = object->tqmetaObject(); + TQMetaObject *meta = object->metaObject(); int idx = meta->findSlot( slot + 1, true ); if( idx < 0 ) @@ -2430,7 +2430,7 @@ void KApplication::kdisplaySetPalette() return; } #endif - TQApplication::tqsetPalette( createApplicationPalette(), true); + TQApplication::setPalette( createApplicationPalette(), true); emit kdisplayPaletteChanged(); emit appearanceChanged(); } @@ -2438,10 +2438,10 @@ void KApplication::kdisplaySetPalette() void KApplication::kdisplaySetFont() { - 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"); + 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"); // "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::tqfromLatin1("kmail") + if (command.isEmpty() || command == TQString::fromLatin1("kmail") || command.endsWith("/kmail")) { - command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); + command = TQString::fromLatin1("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/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h index 75b5782e4..6ebba1573 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::tqfromLatin1("gregorian"), + static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"), const KLocale * locale = 0); /** diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp index 19f9b3dc8..38ee1014a 100644 --- a/tdecore/kcalendarsystemgregorian.cpp +++ b/tdecore/kcalendarsystemgregorian.cpp @@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const TQString KCalendarSystemGregorian::calendarName() const { - return TQString::tqfromLatin1("gregorian"); + return TQString::fromLatin1("gregorian"); } bool KCalendarSystemGregorian::isLunar() const diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp index 710e027d1..9c04942a5 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::tqfromLatin1("hebrew"); + return TQString::fromLatin1("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::tqfromLatin1("he")) + if (locale()->language() == TQString::fromLatin1("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::tqfromLatin1("he")) + if (locale()->language() == TQString::fromLatin1("he")) sResult = num2heb(year(pDate), !bShort); else sResult = KCalendarSystem::yearString(pDate, bShort); diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp index 90faec48e..a6487060e 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::tqfromLatin1("hijri"); + return TQString::fromLatin1("hijri"); } bool KCalendarSystemHijri::isLunar() const diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp index 6197ca75f..29798a1dd 100644 --- a/tdecore/kcalendarsystemjalali.cpp +++ b/tdecore/kcalendarsystemjalali.cpp @@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const } TQString KCalendarSystemJalali::calendarName() const { - return TQString::tqfromLatin1("jalali"); + return TQString::fromLatin1("jalali"); } bool KCalendarSystemJalali::isLunar() const diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp index df07fef44..24d0193b2 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::tqfromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") .arg( d->language ) .arg( d->name ); diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index b78345276..491eeb64c 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -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::tqfromLatin1( *pos )); + available.append( TQString::fromLatin1( *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::tqfromLatin1( pos->index ); + const TQString name = TQString::fromLatin1( 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::tqfromLatin1("/usr/share/i18n/charmaps")); + dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/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::tqfromLatin1(cname); + const TQString basicName = TQString::fromLatin1(cname); kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl; TQString charMapFileName; diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 3c76feca1..a3a941494 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::tqfromLatin1(args->name))); + optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name))); else optionsHeader = i18n("\nOptions:\n"); diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp index 813b56027..784ad017b 100644 --- a/tdecore/kcompletion.cpp +++ b/tdecore/kcompletion.cpp @@ -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->tqchildAt(i); + temp_node = node->childAt(i); if( temp_node->weight() > weight ) { hit = temp_node; weight = hit->weight(); @@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const switch ( mode ) { case Rotation: - event = TQString::tqfromLatin1("Textcompletion: rotation"); + event = TQString::fromLatin1("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::tqfromLatin1("Textcompletion: partial match"); + event = TQString::fromLatin1("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::tqfromLatin1("Textcompletion: no match"); + event = TQString::fromLatin1("Textcompletion: no match"); text = i18n("There is no matching item available.\n"); } break; diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h index fcfea7243..bd199bdfd 100644 --- a/tdecore/kcompletion_private.h +++ b/tdecore/kcompletion_private.h @@ -118,7 +118,7 @@ public: inline const KCompTreeChildren * children() const { return &myChildren; } - inline const KCompTreeNode * tqchildAt(int index) const { + inline const KCompTreeNode * childAt(int index) const { return myChildren.tqat(index); } inline const KCompTreeNode * firstChild() const { diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp index 10c91834c..b75d7e05d 100644 --- a/tdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp @@ -265,7 +265,7 @@ static TQString literalString( const TQString &s ) if (s[i].tqunicode() > 127) isAscii = false; if (isAscii) - return "TQString::tqfromLatin1( " + quoteString(s) + " )"; + return "TQString::fromLatin1( " + 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::tqfromLatin1( \""+group+"\" )"; + return "TQString::fromLatin1( \""+group+"\" )"; - return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments; + return "TQString::fromLatin1( \""+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::tqfromLatin1( \""; + out << "if (!" << This << "isImmutable( TQString::fromLatin1( \""; if (!e->param().isEmpty()) { out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( "; if ( e->paramType() == "Enum" ) { - out << "TQString::tqfromLatin1( "; + out << "TQString::fromLatin1( "; 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::tqfromLatin1( \"" << cfgFileName << "\" "; + if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << 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::tqfromLatin1( \"" << (*it).name << "\" );" << endl; + cpp << " choice.name = TQString::fromLatin1( \"" << (*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::tqfromLatin1( \"" << e->name() << "\" )"; + if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << 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::tqfromLatin1( \""; + cpp << " addItem( " << itemVarStr << ", TQString::fromLatin1( \""; 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 3dd197b34..2f8e7eee3 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::tqfromLatin1(testCases[ i ])); + performCompare(TQString::fromLatin1(testCases[ i ])); ++i; } @@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput() i= 0; while (willFailCases[ i ]) { - performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true); + performCompare(TQString::fromLatin1(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::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref")); + TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".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 f8c4c1189..b3050921e 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::tqfromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) ); + setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) ); KConfigSkeleton::ItemBool *itemOneOption; - itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true ); - addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) ); + itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true ); + addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) ); KConfigSkeleton::ItemInt *itemAnotherOption; - itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 ); - addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) ); + itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 ); + addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "One" ); + choice.name = TQString::fromLatin1( "One" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Two" ); + choice.name = TQString::fromLatin1( "Two" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Three" ); + choice.name = TQString::fromLatin1( "Three" ); valuesListOption.append( choice ); } KConfigSkeleton::ItemEnum *itemListOption; - itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); - addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) ); + itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); + addItem( itemListOption, TQString::fromLatin1( "ListOption" ) ); - setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) ); + setCurrentGroup( TQString::fromLatin1( "MyOptions" ) ); KConfigSkeleton::ItemString *itemMyString; - itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) ); - addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) ); + itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) ); + addItem( itemMyString, TQString::fromLatin1( "MyString" ) ); KConfigSkeleton::ItemPath *itemMyPath; - itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") ); - addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) ); + itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") ); + addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) ); KConfigSkeleton::ItemInt *itemAnotherOption2; - itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 ); - addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) ); + itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 ); + addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); TQStringList defaultMyStringListHidden; defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) ); defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringListHidden; - itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); - addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) ); + itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); + addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) ); KConfigSkeleton::ItemInt *itemMyNumber; - itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); - addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) ); + itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); + addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) ); } Test1::~Test1() diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref index b5a66b5cd..cc2d99c69 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::tqfromLatin1( "OneOption" ) )) + if (!isImmutable( TQString::fromLatin1( "OneOption" ) )) mOneOption = v; } @@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) )) + if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) )) mAnotherOption = v; } @@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton */ void setListOption( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) )) + if (!isImmutable( TQString::fromLatin1( "ListOption" ) )) mListOption = v; } @@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton */ void setMyString( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyString" ) )) + if (!isImmutable( TQString::fromLatin1( "MyString" ) )) mMyString = v; } @@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton */ void setMyPath( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) )) + if (!isImmutable( TQString::fromLatin1( "MyPath" ) )) mMyPath = v; } @@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption2( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) )) + if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) )) mAnotherOption2 = v; } @@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringList( const TQStringList & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringListHidden( const TQStringList & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) )) + if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) )) mMyStringListHidden = v; } @@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton */ void setMyNumber( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) )) + if (!isImmutable( TQString::fromLatin1( "MyNumber" ) )) mMyNumber = v; } diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref index af8db588d..2d56f7545 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::tqfromLatin1( "korganizerrc" ) ) + : MyPrefs( TQString::fromLatin1( "korganizerrc" ) ) { - setCurrentGroup( TQString::tqfromLatin1( "General" ) ); + setCurrentGroup( TQString::fromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); - mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); + mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); - mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); + mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( i18n("Confirm deletes") ); - addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) ); - mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) ); + mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( i18n("Archive File") ); - addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); + addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "standardDestination" ); + choice.name = TQString::fromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "askDestination" ); + choice.name = TQString::fromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl1" ); + choice.name = TQString::fromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl2" ); + choice.name = TQString::fromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl3" ); + choice.name = TQString::fromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); + mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); mDestinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) ); + addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); + setCurrentGroup( TQString::fromLatin1( "Views" ) ); - mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( i18n("Hour Size") ); - addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); - mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) ); + mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); + setCurrentGroup( TQString::fromLatin1( "Colors" ) ); - mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); + mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( i18n("Highlight color") ); - addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); - mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); + mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); - mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( i18n("Time bar") ); - addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); } Test2::~Test2() diff --git a/tdecore/kconfig_compiler/tests/test2.h.ref b/tdecore/kconfig_compiler/tests/test2.h.ref index 075f48bde..6c0a74d66 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::tqfromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -46,7 +46,7 @@ class Test2 : public MyPrefs */ void setAutoSaveInterval( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) + if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) mAutoSaveInterval = v; } @@ -71,7 +71,7 @@ class Test2 : public MyPrefs */ void setConfirm( bool v ) { - if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) )) + if (!isImmutable( TQString::fromLatin1( "Confirm" ) )) mConfirm = v; } @@ -96,7 +96,7 @@ class Test2 : public MyPrefs */ void setArchiveFile( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) + if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) mArchiveFile = v; } @@ -121,7 +121,7 @@ class Test2 : public MyPrefs */ void setDestination( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "Destination" ) )) + if (!isImmutable( TQString::fromLatin1( "Destination" ) )) mDestination = v; } @@ -146,7 +146,7 @@ class Test2 : public MyPrefs */ void setHourSize( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) )) + if (!isImmutable( TQString::fromLatin1( "HourSize" ) )) mHourSize = v; } @@ -171,7 +171,7 @@ class Test2 : public MyPrefs */ void setSelectionStartsEditor( bool v ) { - if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) + if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) mSelectionStartsEditor = v; } @@ -196,7 +196,7 @@ class Test2 : public MyPrefs */ void setSelectedPlugins( const TQStringList & v ) { - if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) + if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) mSelectedPlugins = v; } @@ -221,7 +221,7 @@ class Test2 : public MyPrefs */ void setHighlightColor( const TQColor & v ) { - if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) + if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) )) mHighlightColor = v; } @@ -246,7 +246,7 @@ class Test2 : public MyPrefs */ void setAgendaBgColor( const TQColor & v ) { - if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) + if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) mAgendaBgColor = v; } @@ -271,7 +271,7 @@ class Test2 : public MyPrefs */ void setTimeBarFont( const TQFont & v ) { - if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) + if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) mTimeBarFont = v; } diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref index a47fd5213..11fe6b38f 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::tqfromLatin1( "test3rc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) ) { - setCurrentGroup( TQString::tqfromLatin1( "General" ) ); + setCurrentGroup( TQString::fromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); - addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); + addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Blah" ) ); + setCurrentGroup( TQString::fromLatin1( "Blah" ) ); - 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" ) ); + 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" ) ); } Test3::~Test3() diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref index 8e86d36b0..75b1b0929 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::tqfromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton */ void setBlubb( int v ) { - if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) )) + if (!isImmutable( TQString::fromLatin1( "Blubb" ) )) mBlubb = v; } @@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton */ void setBlahBlah( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) )) + if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) )) mBlahBlah = v; } @@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton */ void setMyPassword( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) )) + if (!isImmutable( TQString::fromLatin1( "MyPassword" ) )) mMyPassword = v; } diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref index 0eee21488..6918a8c8a 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::tqfromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); + setCurrentGroup( TQString::fromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - 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" ) ); + 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" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Encrypt" ); + choice.name = TQString::fromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Decrypt" ); + choice.name = TQString::fromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "CrashNBurn" ); + choice.name = TQString::fromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "PumpNDump" ); + choice.name = TQString::fromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - 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" ) ); + 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" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); + addItem( itemAge, TQString::fromLatin1( "Age" ) ); } Test4::~Test4() diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref index dc8691b1f..d11dd3aee 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::tqfromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::fromLatin1( "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::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) )) + if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( 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::tqfromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref index 0fc90b387..8373eb3f6 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::tqfromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); + setCurrentGroup( TQString::fromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - 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" ) ); + 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" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Encrypt" ); + choice.name = TQString::fromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Decrypt" ); + choice.name = TQString::fromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "CrashNBurn" ); + choice.name = TQString::fromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "PumpNDump" ); + choice.name = TQString::fromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - 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" ) ); + 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" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); + addItem( itemAge, TQString::fromLatin1( "Age" ) ); } Test5::~Test5() diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref index 9fadbd0ec..efb9b448a 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::tqfromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::fromLatin1( "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::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) )) + if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) )) self()->mMouseAction[i] = v; } @@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton static void setFooBar( const TQString & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref index 2b8a71d50..51b96d4c4 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::tqfromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); + setCurrentGroup( TQString::fromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::fromLatin1( "Color" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); + addItem( itemAge, TQString::fromLatin1( "Age" ) ); } Test6::~Test6() diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref index 18615da38..6743d6064 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::tqfromLatin1( "Color" ) )) + if (!isImmutable( TQString::fromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) + if (!isImmutable( TQString::fromLatin1( "Age" ) )) mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref index dab0ae27d..91a22e036 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::tqfromLatin1( "test7rc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); + setCurrentGroup( TQString::fromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::fromLatin1( "Color" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); + addItem( itemAge, TQString::fromLatin1( "Age" ) ); } Test7::~Test7() diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref index f67bc30cb..8f8808da1 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::tqfromLatin1( "Color" ) )) + if (!isImmutable( TQString::fromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) + if (!isImmutable( TQString::fromLatin1( "Age" ) )) mAge = v; } diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref index 8d8925c57..f89b7c133 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::tqfromLatin1( "Group" ) ); + setCurrentGroup( TQString::fromLatin1( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); - addItem( itemFont, TQString::tqfromLatin1( "Font" ) ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); + addItem( itemFont, TQString::fromLatin1( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); - addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); + addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); } Test8a::~Test8a() diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref index a1ac4de64..2e947c437 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::tqfromLatin1( "Font" ) )) + if (!isImmutable( TQString::fromLatin1( "Font" ) )) mFont = v; } @@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton */ void setTitleFont( const TQFont & v ) { - if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) )) + if (!isImmutable( TQString::fromLatin1( "TitleFont" ) )) mTitleFont = v; } diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref index 566902399..e29e3c4e7 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::tqfromLatin1( "Group8b1" ) ); + setCurrentGroup( TQString::fromLatin1( "Group8b1" ) ); KConfigSkeleton::ItemUInt *itemSomething; - itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 ); - addItem( itemSomething, TQString::tqfromLatin1( "Something" ) ); + itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 ); + addItem( itemSomething, TQString::fromLatin1( "Something" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) ); + setCurrentGroup( TQString::fromLatin1( "Group8b2" ) ); KConfigSkeleton::ItemBool *itemFooBoo; - itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false ); - addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) ); + itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false ); + addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) ); KConfigSkeleton::ItemUInt *itemPort; - itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 ); - addItem( itemPort, TQString::tqfromLatin1( "Port" ) ); + itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 ); + addItem( itemPort, TQString::fromLatin1( "Port" ) ); } Test8b::~Test8b() diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref index dfc9089e3..4ca0d5c7f 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::tqfromLatin1( "Something" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Something" ) )) self()->mSomething = v; } @@ -40,7 +40,7 @@ class Test8b : public Test8a static void setFooBoo( bool v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) )) self()->mFooBoo = v; } @@ -59,7 +59,7 @@ class Test8b : public Test8a static void setPort( uint v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Port" ) )) self()->mPort = v; } diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref index 606f21ed1..c5d57e4d1 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::tqfromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) ); + setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); TQStringList defaultMyPathList; defaultMyPathList.append( TQString::fromUtf8( "/home" ) ); defaultMyPathList.append( TQString::fromUtf8( "~" ) ); KConfigSkeleton::ItemPathList *itemMyPathList; - itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); - addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) ); + itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); + addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) ); KConfigSkeleton::ItemPathList *itemMyPathsList2; - itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() ); - addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) ); + itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() ); + addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) ); } Test9::~Test9() diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref index 0476c8a19..66a629b48 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::tqfromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathList( const TQStringList & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) )) + if (!isImmutable( TQString::fromLatin1( "MyPathList" ) )) mMyPathList = v; } @@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathsList2( const TQStringList & v ) { - if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) )) + if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) )) mMyPathsList2 = v; } diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp index 796ec0001..12e16e0d4 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::tqfromLatin1("/.kde"); + TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.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 00e933564..7b5f55f03 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::tqfromLatin1( "korganizerrc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) ) { d = new TestDPointerPrivate; mSelf = this; - setCurrentGroup( TQString::tqfromLatin1( "General" ) ); + setCurrentGroup( TQString::fromLatin1( "General" ) ); - d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false ); + d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "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::tqfromLatin1( "AutoSave" ) ); - d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); + addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) ); + d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); - d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true ); + addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); + d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true ); d->confirmItem->setLabel( i18n("Confirm deletes") ); - addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) ); - d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile ); + addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) ); + d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile ); d->archiveFileItem->setLabel( i18n("Archive File") ); - addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); + addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "standardDestination" ); + choice.name = TQString::fromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "askDestination" ); + choice.name = TQString::fromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl1" ); + choice.name = TQString::fromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl2" ); + choice.name = TQString::fromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "argl3" ); + choice.name = TQString::fromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); + d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); d->destinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) ); + addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); + setCurrentGroup( TQString::fromLatin1( "Views" ) ); - d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 ); + d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 ); d->hourSizeItem->setLabel( i18n("Hour Size") ); - addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); - d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); + addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) ); + d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); + addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); + d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); + addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); + setCurrentGroup( TQString::fromLatin1( "Colors" ) ); - d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); + d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); d->highlightColorItem->setLabel( i18n("Highlight color") ); - addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); - d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); + d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); d->agendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); + addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); - d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont ); + d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont ); d->timeBarFontItem->setLabel( i18n("Time bar") ); - addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); + addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); } void TestDPointer::setAutoSave( bool v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) )) self()->d->autoSave = v; } @@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem() void TestDPointer::setAutoSaveInterval( int v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) self()->d->autoSaveInterval = v; } @@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem() void TestDPointer::setConfirm( bool v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) )) self()->d->confirm = v; } @@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem() void TestDPointer::setArchiveFile( const TQString & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) self()->d->archiveFile = v; } @@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem() void TestDPointer::setDestination( int v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) )) self()->d->destination = v; } @@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem() void TestDPointer::setHourSize( int v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) )) self()->d->hourSize = v; } @@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem() void TestDPointer::setSelectionStartsEditor( bool v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) self()->d->selectionStartsEditor = v; } @@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem() void TestDPointer::setSelectedPlugins( const TQStringList & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) self()->d->selectedPlugins = v; } @@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem() void TestDPointer::setHighlightColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) )) self()->d->highlightColor = v; } @@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem() void TestDPointer::setAgendaBgColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) self()->d->agendaBgColor = v; } @@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem() void TestDPointer::setTimeBarFont( const TQFont & v ) { - if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) self()->d->timeBarFont = v; } diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index 633458d41..85e44ebaa 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, if (useKDEGlobals) mGlobalFileName = KGlobal::dirs()->saveLocation("config") + - TQString::tqfromLatin1("kdeglobals"); + TQString::fromLatin1("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::tqfromLatin1("kdeglobals")); + findAllResources("config", TQString::fromLatin1("kdeglobals")); #ifdef Q_WS_WIN TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); #else - TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc"); + TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); #endif if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; kdercs += KGlobal::dirs()-> - findAllResources("config", TQString::tqfromLatin1("system.kdeglobals")); + findAllResources("config", TQString::fromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index 20d3f023c..0b3e05b35 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey, return readDateTimeEntry(pKey.utf8().data(), pDefault); } -// ### tqcurrentDateTime() as fallback ? (Harri) +// ### currentDateTime() as fallback ? (Harri) TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, const TQDateTime* pDefault ) const { @@ -1034,7 +1034,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, if( pDefault ) return *pDefault; else - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); } TQStrList list; @@ -1048,7 +1048,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, return TQDateTime( date, time ); } - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); } 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::tqfromLatin1("$HOME")); + path.replace(0, len, TQString::fromLatin1("$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.tqstartsWith("file:", false); + bool startsWithFile = path.startsWith("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::tqfromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); return; } TQStringList new_list; @@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); return; } TQString str_list; diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 01c758da5..2f41195aa 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 ( tqcurrentDateTime() by default) + * @param pDefault A default value ( currentDateTime() 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 ( tqcurrentDateTime() by default) + * @param pDefault A default value ( currentDateTime() 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::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::fromLatin1(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::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); } /** * Write a (key/value) pair. diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp index adebca525..82567ca0b 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->tqmetaObject()->findProperty("minValue", true) != -1) + if (widget->metaObject()->findProperty("minValue", true) != -1) widget->setProperty("minValue", minValue); } TQVariant maxValue = item->maxValue(); if (maxValue.isValid()) { - if (widget->tqmetaObject()->findProperty("maxValue", true) != -1) + if (widget->metaObject()->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->tqmetaObject()->tqsuperClassName()); + changedIt = changedMap.find(childWidget->metaObject()->superClassName()); } if (changedIt == changedMap.end()) diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index a43327da1..dde0779cf 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::tqfromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1(""), // 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::tqfromLatin1("")); // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !! }; /** @@ -859,7 +859,7 @@ public: * @return The created item */ ItemString *addItemString(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1(""), // 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::tqfromLatin1(""), + const TQString & defaultValue = TQString::fromLatin1(""), 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::tqfromLatin1(""), + const TQString & defaultValue = TQString::fromLatin1(""), const TQString & key = TQString::null); /** diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp index 3742c509c..24bf6768b 100644 --- a/tdecore/kdcoppropertyproxy.cpp +++ b/tdecore/kdcoppropertyproxy.cpp @@ -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->tqmetaObject(); + TQMetaObject *metaObj = object->metaObject(); 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->tqmetaObject()->propertyNames( static_cast<bool>( b ) ); + TQStrList props = object->metaObject()->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->tqmetaObject()->propertyNames( true ).contains( propName ) ) + if ( !object->metaObject()->propertyNames( true ).contains( propName ) ) return false; return true; diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in index 4accfbc85..0fdf56e3d 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::tqfromLatin1(_input); + TQString result = TQString::fromLatin1(_input); if (!_expandvars) return result; diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index ed1a3d60d..2914881db 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -567,8 +567,8 @@ TQString kdBacktrace(int levels) for (int i = 0; i < n; ++i) s += TQString::number(i) + - TQString::tqfromLatin1(": ") + - TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n"); + TQString::fromLatin1(": ") + + TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n"); s += "]\n"; if (strings) free (strings); diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h index fc9bb1294..a65667d1b 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::tqfromLatin1(initialString)), area(_area), level(_level), print(_print) { } + output(TQString::fromLatin1(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::tqfromLatin1(i ? "true" : "false"); + output += TQString::fromLatin1(i ? "true" : "false"); return *this; } /** diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 431a65578..ac7fd250c 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -42,7 +42,7 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) - : KConfig(TQString::tqfromLatin1(""), bReadOnly, false) + : KConfig(TQString::fromLatin1(""), 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::tqfromLatin1(".desktop")) + if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop")) return true; - else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk")) + else if(len > 7 && path.right(7) == TQString::fromLatin1(".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::tqfromLatin1(key) + "(" + fName + "): " + value; + TQString po_lookup_key = TQString::fromLatin1(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::tqfromLatin1("Desktop Action ") + group); + setGroup(TQString::fromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasActionGroup(const TQString &group) const { - return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group); + return hasGroup(TQString::fromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasLinkType() const { - return readEntry("Type") == TQString::tqfromLatin1("Link"); + return readEntry("Type") == TQString::fromLatin1("Link"); } bool KDesktopFile::hasApplicationType() const { - return readEntry("Type") == TQString::tqfromLatin1("Application"); + return readEntry("Type") == TQString::fromLatin1("Application"); } bool KDesktopFile::hasMimeTypeType() const { - return readEntry("Type") == TQString::tqfromLatin1("MimeType"); + return readEntry("Type") == TQString::fromLatin1("MimeType"); } bool KDesktopFile::hasDeviceType() const { - return readEntry("Type") == TQString::tqfromLatin1("FSDev") || - readEntry("Type") == TQString::tqfromLatin1("FSDevice"); + return readEntry("Type") == TQString::fromLatin1("FSDev") || + readEntry("Type") == TQString::fromLatin1("FSDevice"); } bool KDesktopFile::tryExec() const diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index 5aad239bd..fcda490b8 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) { - setqStatus(errorcode); + seStatus(errorcode); d->syserror = syserror; } diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc index c3afb1b5a..330af8aa2 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 *tqmetaObject = Product::tqstaticMetaObject(); - while ( tqmetaObject ) + TQMetaObject *metaObject = Product::staticMetaObject(); + while ( metaObject ) { - if ( !qstrcmp( className, tqmetaObject->className() ) ) + if ( !qstrcmp( className, metaObject->className() ) ) return create( parentWidget, widgetName, parent, name, args, Type2Type<BaseType>() ); - tqmetaObject = tqmetaObject->tqsuperClass(); + metaObject = metaObject->superClass(); } return 0; } diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index d64974be4..b886d8d7f 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::tqfromLatin1(str)); + return staticQString(TQString::fromLatin1(str)); } class KStringDict : public TQDict<TQString> diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 674f09671..8b0c81f1a 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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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 c2f7a3829..ae1360391 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->metaObject()->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/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 9c76c7e4d..d866fa0d2 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::tqfromLatin1("trans") - : TQString::tqfromLatin1("notrans"); + cached += mTrans[group][state] ? TQString::fromLatin1("trans") + : TQString::fromLatin1("notrans"); if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome) { cached += ':'; diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 317a56add..3c5cf7135 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::tqfromLatin1(groups[i]) + "Icons"); + config->setGroup(TQString::fromLatin1(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::tqfromLatin1(":dblsize"); + key += TQString::fromLatin1(":dblsize"); } else - key += TQString::tqfromLatin1("noeffect"); + key += TQString::fromLatin1("noeffect"); key += '_'; key += overlayStr; diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index 0f7d3b605..d30e254d0 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::tqfromLatin1("hicolor") ) *_theme = defaultThemeName(); + if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); /* if (_theme->isEmpty()) { if (TQPixmap::defaultDepth() > 8) *_theme = defaultThemeName(); else - *_theme = TQString::tqfromLatin1("locolor"); + *_theme = TQString::fromLatin1("locolor"); }*/ return *_theme; } @@ -511,7 +511,7 @@ void KIconTheme::reconfigure() // static TQString KIconTheme::defaultThemeName() { - return TQString::tqfromLatin1("crystalsvg"); + return TQString::fromLatin1("crystalsvg"); } /*** KIconThemeDir ***/ diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp index 1ce2c1348..ca41fecdf 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::tqfromLatin1(toAsciiCString(idna.mid(1))); + TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1))); if (host.isEmpty()) return TQString::null; // Error return idna[0] + host; } - return TQString::tqfromLatin1(toAsciiCString(idna)); + return TQString::fromLatin1(toAsciiCString(idna)); } TQString KIDNA::toUnicode(const TQString &idna) diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index 114746d0f..d47de5a03 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -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::tqfromLatin1(maincatalogue); + mainCatalogue = TQString::fromLatin1(maincatalogue); } } @@ -312,13 +312,13 @@ void KLocale::initFormat() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig entry(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_country)), true); entry.setGroup("KCM Locale"); // Numeric #define readConfigEntry(key, default, save) \ - save = entry.readEntry(key, TQString::tqfromLatin1(default)); \ + save = entry.readEntry(key, TQString::fromLatin1(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::tqfromLatin1("$0"), TQString() ); + m_thousandsSeparator.replace( TQString::fromLatin1("$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::tqfromLatin1("$0"), TQString()); + m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$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::tqfromLatin1("%1/entry.desktop") + TQString::fromLatin1("%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::tqfromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::fromLatin1("%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::tqfromLatin1(maincatalogue); + appName = TQString::fromLatin1(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::tqfromLatin1("%1/LC_MESSAGES/%2.mo") + TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") .arg( language ) .arg( appName ); // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl; @@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat bool KLocale::use12Clock() const { - if ((timeFormat().contains(TQString::tqfromLatin1("%I")) > 0) || - (timeFormat().contains(TQString::tqfromLatin1("%l")) > 0)) + if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) || + (timeFormat().contains(TQString::fromLatin1("%l")) > 0)) return true; else return false; @@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const TQString KLocale::languages() const { - return d->languageList.join( TQString::tqfromLatin1(":") ); + return d->languageList.join( TQString::fromLatin1(":") ); } TQStringList KLocale::languageList() const @@ -2008,7 +2008,7 @@ void KLocale::initInstance() KInstance *app = KGlobal::instance(); if (app) { - KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName())); + KGlobal::_locale = new KLocale(TQString::fromLatin1(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::tqfromLatin1("en_US"); + return TQString::fromLatin1("en_US"); } TQString KLocale::defaultCountry() { - return TQString::tqfromLatin1("C"); + return TQString::fromLatin1("C"); } const char * KLocale::encoding() const @@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const TQStringList result; - KConfig config(TQString::tqfromLatin1("language.codes"), true, false); + KConfig config(TQString::fromLatin1("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::tqfromLatin1("UTF-8"); } +TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); } // KDE4: remove #if 0 diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index c219cef28..e07522fca 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->tqtopLevelWidget()->winId(); + winId = (int)widget->topLevelWidget()->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::tqfromLatin1("cannotopenfile"); + message = TQString::fromLatin1("cannotopenfile"); break; case warning: - message = TQString::tqfromLatin1("warning"); + message = TQString::fromLatin1("warning"); break; case fatalError: - message = TQString::tqfromLatin1("fatalerror"); + message = TQString::fromLatin1("fatalerror"); break; case catastrophe: - message = TQString::tqfromLatin1("catastrophe"); + message = TQString::fromLatin1("catastrophe"); break; case notification: // fall through default: - message = TQString::tqfromLatin1("notification"); + message = TQString::fromLatin1("notification"); break; } diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index 65496bf10..7e9941717 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::tqfromLatin1(buffer, buflen); + * TQString myBuf = TQString::fromLatin1(buffer, buflen); * \endcode **/ void receivedStdout(KProcess *proc, char *buffer, int buflen); diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 93692c735..943ad1b9a 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::tqfromLatin1("unknown"); + return TQString::fromLatin1("unknown"); return prot->m_icon; } diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp index 72625a9ca..cddf44bc5 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::tqfromLatin1(".new"), mode)) + if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode)) { mFileName = real_filename; // Set filename upon success diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h index 7cf4bc7e9..e035115a9 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::tqfromLatin1( "~" ) ); + const TQString& backupExtension = TQString::fromLatin1( "~" ) ); private: TQString mFileName; diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 15597826d..6b4e13a14 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::tqfromLatin1(""), bReadOnly, false) + : KConfig(TQString::fromLatin1(""), 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 6ce802716..899f32dba 100644 --- a/tdecore/ksockaddr.cpp +++ b/tdecore/ksockaddr.cpp @@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const return i18n("<empty>"); } - return TQString::tqfromLatin1(buf); // FIXME! What's the encoding? + return TQString::fromLatin1(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::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN)); + return TQString::fromLatin1(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 038b5ce06..f9aaae586 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::tqfromLatin1(types[i])); + list.append(TQString::fromLatin1(types[i])); return list; } @@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type) #else //UNIX if (relink) { - TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir()); + TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir()); if (srv.isEmpty()) - srv = findExe(TQString::tqfromLatin1("lnusertemp")); + srv = findExe(TQString::fromLatin1("lnusertemp")); if (!srv.isEmpty()) { system(TQFile::encodeName(srv)+" "+type); @@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir() if (!s->defaultbindir.isEmpty()) return s->defaultbindir; #ifdef Q_WS_WIN - s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); #else //UNIX s->defaultbindir = __KDE_BINDIR; if (s->defaultbindir.isEmpty()) - s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/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::tqfromLatin1("Directories"); + TQString group = TQString::fromLatin1("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::tqfromLatin1("Directories-%1").arg(profile); + group = TQString::fromLatin1("Directories-%1").arg(profile); profiles.pop_back(); priority = true; } diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp index 00a9f5b81..f201b70c0 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::tqfromLatin1( "new: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "new: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "change: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "change: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "remove: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( "remove: %1 %2" ) + TQString msg = TQString::fromLatin1( "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::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id())); + return TQString::fromLatin1( " 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::tqfromLatin1( "ID=" ); + const TQString id_str = TQString::fromLatin1( "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::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); + ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); if( !d->name.isEmpty()) - ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); + ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); if( !d->description.isEmpty()) - ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); + ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); if( !d->icon.isEmpty()) - ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon ); + ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon ); if( d->desktop != 0 ) - ret += TQString::tqfromLatin1( " DESKTOP=%1" ) + ret += TQString::fromLatin1( " DESKTOP=%1" ) .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0 if( !d->wmclass.isEmpty()) - ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); + ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); if( !d->hostname.isEmpty()) - ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); + ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); for( TQValueList< pid_t >::ConstIterator it = d->pids.begin(); it != d->pids.end(); ++it ) - ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it ); + ret += TQString::fromLatin1( " PID=%1" ).arg( *it ); if( d->silent != Unknown ) - ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); + ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); if( d->timestamp != -1U ) - ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); + ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); if( d->screen != -1 ) - ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen ); + ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen ); if( d->xinerama != -1 ) - ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); + ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); if( d->launched_by != 0 ) - ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by ); + ret += TQString::fromLatin1( " 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::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=" ); + 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=" ); for( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index 3a655d617..f95062fa0 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->tqsetBufferFromCopy(TQByteArray()); + buffer->setBuffer(TQByteArray()); buffer->open(IO_ReadWrite); m_str = new TQDataStream( buffer); (*m_str) << (TQ_INT32) KSYCOCA_VERSION; diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index dbd589d85..77a0cca0f 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -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::tqcurrentDateTime(basisSpec); + TQDateTime basisTime = TQDateTime::currentDateTime(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::tqcurrentDateTime(Qt::LocalTime); + TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); int offset = remoteTime.secsTo(basisTime); // Now restore things diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index f6c3fd19b..e8b2e2dd8 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint ) KURL::KURL( const char * url, int encoding_hint ) { reset(); - parse( TQString::tqfromLatin1(url), encoding_hint ); + parse( TQString::fromLatin1(url), encoding_hint ); } KURL::KURL( const TQCString& url, int encoding_hint ) { reset(); - parse( TQString::tqfromLatin1(url), encoding_hint ); + parse( TQString::fromLatin1(url), encoding_hint ); } KURL::KURL( const KURL& _u ) @@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url ) KURL& KURL::operator=( const char * _url ) { reset(); - parse( TQString::tqfromLatin1(_url) ); + parse( TQString::fromLatin1(_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::tqfromLatin1("") ); + result.insert( name, TQString::fromLatin1("") ); 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::tqfromLatin1(""); + return TQString::fromLatin1(""); } } diff --git a/tdecore/kurl.h b/tdecore/kurl.h index 9cfac2885..6ed5dc652 100644 --- a/tdecore/kurl.h +++ b/tdecore/kurl.h @@ -281,7 +281,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::tqfromLatin1() + * @see TQString::fromLatin1() */ KURL( const char * url, int encoding_hint = 0 ); /** @@ -307,7 +307,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::tqfromLatin1() + * @see TQString::fromLatin1() */ KURL( const TQCString& url, int encoding_hint = 0 ); diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index 9785ce36c..f8f993a08 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::tqfromLatin1("")); + d->localResolver.setServiceName(TQString::fromLatin1("")); // 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 648f4e571..f61559bfb 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::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n" + TQString request = TQString::fromLatin1("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 93c029b8e..1a2b062c4 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -915,7 +915,7 @@ TQString KResolver::localHostName() } if (name.isEmpty()) - return TQString::tqfromLatin1("localhost"); + return TQString::fromLatin1("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::tqfromLatin1("localhost"); + return TQString::fromLatin1("localhost"); else return results.first().canonicalName(); } @@ -943,7 +943,7 @@ 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::tqfromLatin1(kde_use_idn).lower())); + return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower())); } // implement the ToAscii function, as described by IDN documents @@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain) TQString KResolver::domainToUnicode(const TQCString& asciiDomain) { - return domainToUnicode(TQString::tqfromLatin1(asciiDomain)); + return domainToUnicode(TQString::fromLatin1(asciiDomain)); } // implement the ToUnicode function, as described by IDN documents diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 6236cc15d..a6f4e4ec0 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::tqfromLatin1(KResolver::domainToAscii(host)); + TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host)); TQMutexLocker locker(&blacklistMutex); @@ -251,7 +251,7 @@ namespace // check blacklist if (m_af != AF_INET && - KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname))) + KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname))) break; # ifdef USE_GETHOSTBYNAME2_R @@ -358,7 +358,7 @@ namespace if (socktype == 0) socktype = SOCK_STREAM; // default - TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name)); + TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(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::tqfromLatin1(m_node))) + KBlacklistWorker::isBlacklisted(TQString::fromLatin1(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::tqfromLatin1("*") || - node == TQString::tqfromLatin1("localhost")) + if (node.isEmpty() || node == TQString::fromLatin1("*") || + node == TQString::fromLatin1("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::tqfromLatin1("*")) == 0) + if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 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::tqfromLatin1(m_encodedName))); + sa.setHost(KIpAddress(TQString::fromLatin1(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 00ef7f81d..5c602458c 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::tqfromLatin1(h)); - service = TQString::tqfromLatin1(s); + node = KResolver::domainToUnicode(TQString::fromLatin1(h)); + service = TQString::fromLatin1(s); success = true; } else diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index bd63d6306..49facb12c 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::tqfromLatin1("")); + d->resolver.setServiceName(TQString::fromLatin1("")); // 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 feaabfab5..dccac12bd 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::tqfromLatin1(address)); + return setAddress(TQString::fromLatin1(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::tqfromLatin1(buf); + return TQString::fromLatin1(buf); case 6: #ifdef AF_INET6 inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1); #endif - return TQString::tqfromLatin1(buf); + return TQString::fromLatin1(buf); } return TQString::null; @@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const fmt = "[%1]:%2"; #endif else if (d->addr.generic->sa_family == AF_UNIX) - return TQString::tqfromLatin1("unix:%1").arg(serviceName()); + return TQString::fromLatin1("unix:%1").arg(serviceName()); else return i18n("1: the unknown socket address family number", "Unknown family %1").arg(d->addr.generic->sa_family); diff --git a/tdecore/network/ksocketbase.cpp b/tdecore/network/ksocketbase.cpp index f5410f3e8..8449dbdc8 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); - setqStatus(status); + seStatus(status); } void KActiveSocketBase::resetError() diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index 2ec5bb4bf..31eaa1f1e 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::tqfromLatin1("*") || - node == TQString::tqfromLatin1("localhost")) + if (node.isEmpty() || node == TQString::fromLatin1("*") || + node == TQString::fromLatin1("localhost")) return false; // empty == localhost encodedName = KResolver::domainToAscii(node); @@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { - dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv); + dns = new TQDns(TQString::fromLatin1(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 85830126b..d035972ef 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()->tqworldMatrix(); + TQWMatrix *current = m_engine->painter()->worldMatrix(); #ifdef USE_QT4 printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r"); #else // USE_QT4 @@ -628,7 +628,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path) d->width = w; d->height = h; - d->painter->tqworldMatrix()->scale(vratiow, vratioh); + d->painter->worldMatrix()->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->tqworldMatrix()->scale(ratiow, ratioh); + d->painter->worldMatrix()->scale(ratiow, ratioh); } - TQWMatrix initialMatrix = *d->painter->tqworldMatrix(); + TQWMatrix initialMatrix = *d->painter->worldMatrix(); d->helper->m_initialMatrix = initialMatrix; // Apply transform diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp index 6c4c52c6a..dbd867f13 100644 --- a/tdecore/svgicons/ksvgiconpainter.cpp +++ b/tdecore/svgicons/ksvgiconpainter.cpp @@ -65,7 +65,7 @@ public: m_useFillGradient = false; m_useStrokeGradient = false; - m_tqworldMatrix = new TQWMatrix(); + m_worldMatrix = 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_tqworldMatrix; + delete m_worldMatrix; 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_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(); + 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(); 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_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(); + 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(); 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_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 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 dx = x2n - x1n; double dy = y2n - y1n; @@ -515,12 +515,12 @@ public: else fy = cy; - 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->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->fx = (fx - cx) / r; radial->fy = (fy - cy) / r; @@ -1123,7 +1123,7 @@ private: ArtSVP *m_clipSVP; TQImage *m_image; - TQWMatrix *m_tqworldMatrix; + TQWMatrix *m_worldMatrix; TQString m_fillRule; TQString m_joinStyle; @@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image() return new TQImage(*d->helper->m_image); } -TQWMatrix *KSVGIconPainter::tqworldMatrix() +TQWMatrix *KSVGIconPainter::worldMatrix() { - return d->helper->m_tqworldMatrix; + return d->helper->m_worldMatrix; } void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix) { - if(d->helper->m_tqworldMatrix) - delete d->helper->m_tqworldMatrix; + if(d->helper->m_worldMatrix) + delete d->helper->m_worldMatrix; - d->helper->m_tqworldMatrix = matrix; + d->helper->m_worldMatrix = 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_tqworldMatrix->m11(); - affine[1] = d->helper->m_tqworldMatrix->m12(); - affine[2] = d->helper->m_tqworldMatrix->m21(); - affine[3] = d->helper->m_tqworldMatrix->m22(); + 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(); // use the world matrix to convert the coordinates - d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]); + d->helper->m_worldMatrix->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 b80eccea8..de5644187 100644 --- a/tdecore/svgicons/ksvgiconpainter.h +++ b/tdecore/svgicons/ksvgiconpainter.h @@ -41,7 +41,7 @@ public: TQImage *image(); - TQWMatrix *tqworldMatrix(); + TQWMatrix *worldMatrix(); void finish(); @@ -61,7 +61,7 @@ public: void setStrokeDashOffset(const TQString &dashOffset); void setStrokeDashArray(const TQString &dashes); - void setWorldMatrix(TQWMatrix *tqworldMatrix); + void setWorldMatrix(TQWMatrix *worldMatrix); 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 8b6e8eea4..51a40b892 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::tqcurrentDate(); + date = TQDate::currentDate(); args->clear(); // Free up some memory. diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index 29f6cd3e3..7323df34c 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::tqfromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); 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::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"; + 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"; 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::tqfromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::tqfromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(",")); + KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); + KGlobal::locale()->setCountry(TQString::fromLatin1("C")); + KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); 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::tqcurrentDate(); - checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + date = TQDate::currentDate(); + checkDate("readDate( TQDate::currentDate() )",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::tqfromLatin1("C")); + KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de")); + KGlobal::locale()->setLanguage(TQString::fromLatin1("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 1b2f5148d..f1d3c11f9 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::tqfromLatin1(node); - TQString _serv = TQString::tqfromLatin1(serv); + TQString _node = TQString::fromLatin1(node); + TQString _serv = TQString::fromLatin1(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::tqfromLatin1(node); - TQString _serv = TQString::tqfromLatin1(serv); + TQString _node = TQString::fromLatin1(node); + TQString _serv = TQString::fromLatin1(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/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp index 69ea7c8a1..650cc0512 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::tqcurrentDateTime()) ); + printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) ); // Find some offsets for Europe/London. char *london = "Europe/London"; |