summaryrefslogtreecommitdiffstats
path: root/tdecore/kconfig_compiler
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:32:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:32:40 -0600
commit984c25aa6969e55896e9a13c8e7f7b8a58991a4e (patch)
tree3653d4ee49b0adf405ff17e0ecdc99bc6f10c1bf /tdecore/kconfig_compiler
parent56160bf4dfe503631ef6373367b281f081bab2b4 (diff)
downloadtdelibs-984c25aa6969e55896e9a13c8e7f7b8a58991a4e.tar.gz
tdelibs-984c25aa6969e55896e9a13c8e7f7b8a58991a4e.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'tdecore/kconfig_compiler')
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp18
-rw-r--r--tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp6
-rw-r--r--tdecore/kconfig_compiler/tests/test1.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test1.h.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test2.cpp.ref66
-rw-r--r--tdecore/kconfig_compiler/tests/test2.h.ref22
-rw-r--r--tdecore/kconfig_compiler/tests/test3.cpp.ref22
-rw-r--r--tdecore/kconfig_compiler/tests/test3.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test4.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test4.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test5.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test5.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test6.cpp.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test6.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test7.cpp.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test7.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.cpp.ref10
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.h.ref4
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.cpp.ref16
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test9.cpp.ref16
-rw-r--r--tdecore/kconfig_compiler/tests/test9.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref88
24 files changed, 258 insertions, 258 deletions
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> &parameters
}
}
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;
}